Feedback from peer review

Refs #3143