Remove and fix some typo in the code