minor cleanups in rules