Correct readme and clean up C++