Make code spacing more consistent

I'm a little surprised we don't have lint rules for this.