Small cosmetic fixes and formatting issues.