Refactored user story status management.