Some basic style cleanup.

I did this to make it a bit more readable.