Small refactor refs #4706