MOM-6 more refactoring, getting rid of duplicate code