decouple state data

Signed-off-by: ezheng <ezheng@cs.unc.edu>
regular commit

Signed-off-by: ezheng <ezheng@cs.unc.edu>