code refactoring
more translations