User refact