Refs #8508 Cosmetic changes in the code