More twitter cleanup
Refactor facebook tool