Refactoring States