Finished clean-up of controller/model