clean up controller a bit