refs #8124. Make changes post code review.