Refactor instant run off solution