Fixed some standard compliance issue