Refactored step state