Refs #4394 Some refactoring