typo and refactoring