Improvements to retweet.
Code cleanup.