Some small style fixes

Style fixes only. Merge please!