Cleaned up friend requests a bit

Trying to cut down on my callback usage