shape container refactoring