Updated readme and tidy up