Refactor Current user management