refactoring avatars