Fixing code conventions details -refs #6680