some typos and refactoring2