some refactoring cmake files, code style fixes