Remove friends
Fix bug
Refactor code