Fix a few minor style issues