Tidy up and readme update