Updated code based on feedback from #racket
Updated TODO