Minor changes to code standard
Minor changes to code standard