Cleaning up code, README