Reduce the number of states generated by the CPS transformer
Cleanup with two loops
Change comment