cv: Spring clean and rejig