Make code spacing more consistent

I'm a little surprised we don't have lint rules for this.
Merge pull request #1403 from spicyj/keyword-spacing

Make code spacing more consistent