Initial release tidy up