Cleaning up for C++11