Refactoring User Class