CAL refactoring

No match.