Made recommended changes to CMakeLists.txt