refactor maker