Fixed the style and CMakeLists.txt