Code cleanup

- Tidied CMakeLists.txt to trigger a flod build as a test.