Some formatting cleanup and the ability to default variable values for rules