Code tidy up
Fix Twitter avatars for retweets.