Clean-up and tweak packaging