cw2: Minor cleanliness refactor