Some Refactor to delete storyboard