Refactor state control variables.
4 files changed