Some code format tweaking

I should use this reformatter tool more!