Refactors executor