cosmetic and formatting fixes.