refactoring gf container