Refactor friend requests