Prepare for english language extension

Refactoring; Overall optimization