Use std::move, nullptr, const, layout changes

Use std::move, nullptr, const, layout changes #3153