Renaming some variables; moving the gravatar element into the class