user model small refractoring