General refactoring, corrected save option

Refs #10064