Refactor app/consumer expressInterest code