CMakeLists.txt: remove comments and tiny reorganization