refactoring. Refs #CORE-574.