Clean up controller a bit more