Friendship Refactoring