Refactor eval -> execute