refactor, add yoda translator