Refactor facebook related classes