Improved comment
Renamed match-state to env, more accurate