Cleaning up the storyboard