cosmetics, refs #1385