Cleaned the controller