Refactor material