Consolidate rule methods in Rule super
Reformat code via codepainter