Several fixes
CMakeLists.txt style changes
Restyling CMakeLists.txt