Refactoring of storyboard