Cleaner code - friends/groups done