Cleaning up a bit of code and updating the README.