States refactorings