Refactoring: store all states
2 files changed