Refactor user information retrieval