REFAACTORING plus typo