Clean up code and readme