Finishing container classes and simplifying accessors / mutators