Refactored friendhip