Updated fav and retweet functions and general clean up of code