Added storyboard initialization, cleaned up code