Issue #22 Cleaned up CRData