Simplify avatar lookup class
Merge pull request #1188 from stephankaag/simplify_avatar_lookup

Simplify avatar lookup class