Refactoring users