#229 updates for english version and refactoring