Various fixes to improve alignment and code readability
Authored by: dcaffrey 2006-08-21
Parent: [r645]
Child: [r647]