cw2: Better comments