Tidy up README and comments