Storyboard refactoing