Avatar change widget: code review & cleanup