manifest tidy up