Packaging style cleanup