CodeCleanUp in CameraControl