Friendships refactor