Code refactoring

Changing comment language to English, fixing some incomprehensible
variable names.