Clean up code and edit readme