Minor cleanup of CMakeLists.txt