Refactor avatars