Improved cleanup.rkt