Neatened code again.

Consistent tabbing and maximum row width.