* Minor refactoring, some duplications removed.
refs #0 Refactorings