User refactoring.