Refactoring initial state