Clean up code and extend README