Style fixes.

It's more readable now.