refactoring on social fu links #35