Perform further refactoring of Facebook API client