Spelling mistakes + refactoring.