Cleaning up controller and views.