Refactor view for coupling/cohesion/consistency