Small cleanup of the CRM class