refactoring some containers