Storyboard refactoring