No functional change; just updated the source formatting (i.e. spaces
only, line up variables, 120 width line wrapping)