cleanups, use c++11 features where appropriate