cleaned up packages constructors and methods