Cleaned up CMakeLists.txt