C++11 refactors..