Typo and refactoring