change controller to clean up