Refs #9445. Fixing some style problems