Refactoring

- Change loading friends method
- Small changes