a little cleanup in the story