STY: Better comments