FacebookService refactor