role refactoring