more c++11 cleanup