Refactor Borrower class