refs #2686 - refactor code