Updated and cleaned up the CMakeLists