User refactoring