Refactor executor