C++11 refactoring