Refactor facebook working neat