Refactoring and reworking of story command.