Update and clean CMakeLists.txt