Cleanup based on feedback from Gunnar

refs #7394