Refactor to use let instead of instance vars.