Tidy up for release 1