refactorings toward operator classes