Changed from google's C++ code conventions to C++11