cleaned the camera and util class