Small refactoring, small docs change

Refs #7860