code cleanup + dummy avatar