Cleaned up model, view, controller.
Cleaned up model, view, controller.