Minor changes to code style

None of this changes should have any effect on the features.

You can also just pick what you like