I ran a formatter on the code

I didn't accept all the changes, but here are the ones I agreed with.