Cleaning up code and readme.