Improved formatting of CMakeLists and of source files. Temporary hack regarding issue #1.