Tidying up README and some small cleaning up of code.