stories refactoring complete.