Format code.

Becuase I'm weird about such things.  I tried to find consistencies and conform the rest of the
code to those.  Let me know if I made anything look ugly ;-)