Improving CMakeLists