Cleanup based on Alex's feedback.

refs #1082