Refactoring: AuthenticationService
Refactoring: GravatarService