Fix review on coding standards

Fix review on coding standards

#5970