Friends refactoring