diff --git a/contracts/flashloan/base/FlashLoanReceiverBase.sol b/contracts/flashloan/base/FlashLoanReceiverBase.sol
index 71c5d9dc..cab5e4db 100644
--- a/contracts/flashloan/base/FlashLoanReceiverBase.sol
+++ b/contracts/flashloan/base/FlashLoanReceiverBase.sol
@@ -12,21 +12,11 @@ abstract contract FlashLoanReceiverBase is IFlashLoanReceiver {
   using SafeERC20 for IERC20;
   using SafeMath for uint256;
 
-  ILendingPoolAddressesProvider internal _addressesProvider;
-  ILendingPool internal _lendingPool;
+  ILendingPoolAddressesProvider public immutable override ADDRESSES_PROVIDER;
+  ILendingPool public immutable override LENDING_POOL;
 
   constructor(ILendingPoolAddressesProvider provider) public {
-    _addressesProvider = provider;
-    _lendingPool = ILendingPool(provider.getLendingPool());
+    ADDRESSES_PROVIDER = provider;
+    LENDING_POOL = ILendingPool(provider.getLendingPool());
   }
-
-  function getAddressesProvider() external view override returns (ILendingPoolAddressesProvider) {
-    return _addressesProvider;
-  }
-
-  function getLendingPool() external view override returns (ILendingPool) {
-    return _lendingPool;
-  }
-
-  receive() external payable {}
 }
diff --git a/contracts/flashloan/interfaces/IFlashLoanReceiver.sol b/contracts/flashloan/interfaces/IFlashLoanReceiver.sol
index 0ffa6a05..7e1b1191 100644
--- a/contracts/flashloan/interfaces/IFlashLoanReceiver.sol
+++ b/contracts/flashloan/interfaces/IFlashLoanReceiver.sol
@@ -19,7 +19,7 @@ interface IFlashLoanReceiver {
     bytes calldata params
   ) external returns (bool);
 
-  function getAddressesProvider() external view returns (ILendingPoolAddressesProvider);
+  function ADDRESSES_PROVIDER() external view returns (ILendingPoolAddressesProvider);
 
-  function getLendingPool() external view returns (ILendingPool);
+  function LENDING_POOL() external view returns (ILendingPool);
 }
diff --git a/contracts/mocks/flashloan/MockFlashLoanReceiver.sol b/contracts/mocks/flashloan/MockFlashLoanReceiver.sol
index ae29b937..a0b3f8ca 100644
--- a/contracts/mocks/flashloan/MockFlashLoanReceiver.sol
+++ b/contracts/mocks/flashloan/MockFlashLoanReceiver.sol
@@ -75,7 +75,7 @@ contract MockFlashLoanReceiver is FlashLoanReceiverBase {
 
       token.mint(premiums[i]);
 
-      IERC20(assets[i]).approve(_addressesProvider.getLendingPool(), amountToReturn);
+      IERC20(assets[i]).approve(address(LENDING_POOL), amountToReturn);
     }
 
     emit ExecutedWithSuccess(assets, amounts, premiums);