some refactoring and added date to return to borrow
some refactoring and added date to return to borrow