Refactored execution