Refactor fb and twitter portion
Merge branch 'refactor'