Refactor, unify style selector rewrites
Rename methods, unify