Minor code claen up according to coding guidelines
Minor code claen up according to coding guidelines
Minor code claen up according to coding guidelines
Minor code claen up according to coding guidelines