Refactoring executors