Super View Controller Refactor/Cleanup/Delegation