Refactoring and fix orthography.