Cleaned up model/controller a bit