Cleaned up CMakeLists a bit