Cleaning up storyline