refs 5919 refactoring