Fix English
Refactoring