did a bit of cleanup for camera