CameraWrapper : More Cleanup!