Make the camera code a bit more consistent