c++11 rafactorings..