Stream-lined and cleaned up the CMake process