Some refactoring
Translation work.. Zzzzzz