Refactor execution