Style update

I don't expect people to know what's in my head convention-wise for little things like this, so I won't nitpick on your PR and make you change a bunch of stuff.