Tidy up
Tidy up for release