Code tidy up.
Updates to README.md.