Fix some code style errors