Refactoring, fixed usage example

Refs #7860