Polish CMakeLists.txt