Cleaning up code, adding more info to README