Fixing/Cleaning up C++11 namespace