refactored some storyscreen and removed comp ugly statements