refactor current user