Refactoring containers