Minor style tweaks.

I also agree with what Thomas is saying but didn't do that