cleaned up the code
cmake's next!