Refactoring request to be leaner and cleaner. refs #7096 @2.0h