Refactored AvatarLookup

Refactored and tested AvatarLookup class