Fixed some code style issues