Refactoring User