Spacing and formatting fixes.