Fix typo and formatting issues