fix(avatars): clean up numerous issues from comments in #1405
Merge pull request #1465 from mozilla/issue-1462-clean-up

fix(avatars): clean up numerous issues from comments in #1405

This gets a stamp from me! 

r+

Thanks @zaach!