some typo fixing and cleaning