Some cleanup to tryout code
Merge branch 'rewrite-racket'