C++11 related cleanup and improvments