cleaned up storyboard