clean controller a little