Fix CMakeLists.txt and whitespace