Introduction of the Container abstraction, Refactoring