Cleaned up code formatting.

Some simple changes from the previous commit were masked by dozens of whitespace changes.