Cleaned up some code, added TweetListener