tidy up packaging