Tidied up the headers and updated the README file