Refactoring + typo