comment cleanup in AvatarData