Minor style cleanup
Switch build system to CMake