Typo and formatting fixes