Clean up equals() in Package and Weight classes