fix some typo and format