Refactoring CML init sequence