Cleanup controller a bit