Fixed some code style issue