Coding style

Various little fixes regarding coding style, after review
by @nilshoerrmann. Thanks Nils!