jfg-334 refactoring