user model little refactoring