Style and whitespace cleanups. The only functional change is removal of
a printf that appears to be left over from development debugging.