Refactor maker profile