Cleanup CMakeLists.txt a little

things that grow need to be cut and put straight once in a while if we want to keep control :)