clean up to match storyboard