Code cleanup with new ViewContoller