Re-structured Gravatar check