c++11 style refactors