Separate and simplify gutter rules
Normalizing naming