Refactor current user method