801-refactor-state #129

Closed fzuray closed 3 years ago