refactoring, facebook integration