Fixed some codeconvention and comments