more refactoring of avatar_url
Merge pull request #104 from acmetech/master

more refactoring of avatar_url