Fixed the code staandard issues