Cleanup Package class

Removes dead code, and does a small stylistic refactoring.