Refactor - Twitter Client