Fix the most obvious egregious style issues.

So that if someday (like today) I decide to try to make this code more efficient
I don't just get physically ill from reading it.