Cleaned up CMake