Refactoring
ready for removing facebook iOS sdk