cleanup syntax-rules code
cleanup syntax-rules code