Refactor Execute Implementation