Some style fixes

A random collection, can do separate PR's but why bother
@DeepDiver1975 @karlitschek