Fixing coding conventions -refs #6222