Minimal refactorings withing the package class.