Refactor the Role class