Cleaned up the CMake files