Cleaned up the code and included CMake