Cleaning up the CMakeLists