Remove defaults in rules and make rule style more consistent