Cleaned up StoryController some more.