Indent things so they line up neatly and remove extra blank lines and
superfluous comments.  No functional change intended.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>