TwitterService refactor