#22 Small cleanups in CRData