C++11 refactorings..