Cleaned up CMakeLists