More cleanup of responsibilities of view/controller