one more jedi's refactoring :-3