Small refactor to conform to a true container view controller