storyboard refactoring