Refactoring user unit