Following coding standards -refs #6803