Cleaned model and controller a bit more