Tidying up the packaging