Tidy up the packaging