Refactor Control State