refactoring storyboard