Clean up whitespace/formatting.  No functional changes.