Cleaned up CMakeLists.txt a little bit