fix(avatars): clean up numerous issues from comments in #1405