MIL-253 refactoring helper class
merge conflicts resolved