Typo + Refactoring