Refactor run/execute