Refactor borrower join