Borrowing and Lending UC refactored