refactoring class/class-maker and class/create