Storyboard tidyup.