Use let instead of define
Revert to previous def using define-values according to racket style http://www.ccs.neu.edu/home/matthias/Style/style/Choosing_the_Right_Construct.html