Clean up code and finish readme