Improve the camera code