minor style changes
first steps toward getting rid of recurring names
next step in removing recurring rule names