applying feedback from mmurray (and IRC)