Refactoring State