Refactored into into Model/View.