Fixed some code style issues
Fixed some code style issues