diff --git a/libi2pd/TunnelConfig.h b/libi2pd/TunnelConfig.h
index 76aa0b34..875c20bb 100644
--- a/libi2pd/TunnelConfig.h
+++ b/libi2pd/TunnelConfig.h
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2013-2020, The PurpleI2P Project
+* Copyright (c) 2013-2021, The PurpleI2P Project
 *
 * This file is part of Purple i2pd project and licensed under BSD3
 *
@@ -31,14 +31,14 @@ namespace tunnel
 
 		TunnelHopConfig * next, * prev;
 		int recordIndex; // record # in tunnel build message
-	
+
 		TunnelHopConfig (std::shared_ptr<const i2p::data::IdentityEx> r);
 		virtual ~TunnelHopConfig () {};
-	
+
 		void SetNextIdent (const i2p::data::IdentHash& ident);
 		void SetReplyHop (uint32_t replyTunnelID, const i2p::data::IdentHash& replyIdent);
 		void SetNext (TunnelHopConfig * n);
-		void SetPrev (TunnelHopConfig * p);		
+		void SetPrev (TunnelHopConfig * p);
 
 		virtual uint8_t GetRetCode (const uint8_t * records) const = 0;
 		virtual void CreateBuildRequestRecord (uint8_t * records, uint32_t replyMsgID) = 0;
@@ -51,47 +51,47 @@ namespace tunnel
 	{
 		ElGamalTunnelHopConfig (std::shared_ptr<const i2p::data::IdentityEx> r):
 			TunnelHopConfig (r) {};
-		uint8_t GetRetCode (const uint8_t * records) const 
-		{ return (records + recordIndex*TUNNEL_BUILD_RECORD_SIZE)[BUILD_RESPONSE_RECORD_RET_OFFSET]; };	
-		void CreateBuildRequestRecord (uint8_t * records, uint32_t replyMsgID);	
-		bool DecryptBuildResponseRecord (uint8_t * records) const;	
-	};	
+		uint8_t GetRetCode (const uint8_t * records) const
+		{ return (records + recordIndex*TUNNEL_BUILD_RECORD_SIZE)[BUILD_RESPONSE_RECORD_RET_OFFSET]; };
+		void CreateBuildRequestRecord (uint8_t * records, uint32_t replyMsgID);
+		bool DecryptBuildResponseRecord (uint8_t * records) const;
+	};
 
 	struct ECIESTunnelHopConfig: public TunnelHopConfig, public i2p::crypto::NoiseSymmetricState
 	{
 		ECIESTunnelHopConfig (std::shared_ptr<const i2p::data::IdentityEx> r):
 			TunnelHopConfig (r) {};
-		void EncryptECIES (const uint8_t * clearText, size_t len, uint8_t * encrypted);	
+		void EncryptECIES (const uint8_t * clearText, size_t len, uint8_t * encrypted);
 		bool DecryptECIES (const uint8_t * key, const uint8_t * nonce, const uint8_t * encrypted, size_t len, uint8_t * clearText) const;
 	};
-	
+
 	struct LongECIESTunnelHopConfig: public ECIESTunnelHopConfig
 	{
 		LongECIESTunnelHopConfig (std::shared_ptr<const i2p::data::IdentityEx> r):
 			ECIESTunnelHopConfig (r) {};
-		uint8_t GetRetCode (const uint8_t * records) const 
-		{ return (records + recordIndex*TUNNEL_BUILD_RECORD_SIZE)[ECIES_BUILD_RESPONSE_RECORD_RET_OFFSET]; };		
-		void CreateBuildRequestRecord (uint8_t * records, uint32_t replyMsgID);
-		bool DecryptBuildResponseRecord (uint8_t * records) const;		
-	};	
+		uint8_t GetRetCode (const uint8_t * records) const override
+		{ return (records + recordIndex*TUNNEL_BUILD_RECORD_SIZE)[ECIES_BUILD_RESPONSE_RECORD_RET_OFFSET]; };
+		void CreateBuildRequestRecord (uint8_t * records, uint32_t replyMsgID) override;
+		bool DecryptBuildResponseRecord (uint8_t * records) const override;
+	};
 
 	struct ShortECIESTunnelHopConfig: public ECIESTunnelHopConfig
 	{
 		ShortECIESTunnelHopConfig (std::shared_ptr<const i2p::data::IdentityEx> r):
 			ECIESTunnelHopConfig (r) {};
-		uint8_t GetRetCode (const uint8_t * records) const 
-		{ return (records + recordIndex*SHORT_TUNNEL_BUILD_RECORD_SIZE)[SHORT_RESPONSE_RECORD_RET_OFFSET]; };		
-		void CreateBuildRequestRecord (uint8_t * records, uint32_t replyMsgID);
-		bool DecryptBuildResponseRecord (uint8_t * records) const;	
+		uint8_t GetRetCode (const uint8_t * records) const override
+		{ return (records + recordIndex*SHORT_TUNNEL_BUILD_RECORD_SIZE)[SHORT_RESPONSE_RECORD_RET_OFFSET]; };
+		void CreateBuildRequestRecord (uint8_t * records, uint32_t replyMsgID) override;
+		bool DecryptBuildResponseRecord (uint8_t * records) const override;
 		void DecryptRecord (uint8_t * records, int index) const override; // Chacha20
-		uint64_t GetGarlicKey (uint8_t * key) const override;	
-	};	
-	
+		uint64_t GetGarlicKey (uint8_t * key) const override;
+	};
+
 	class TunnelConfig
 	{
 		public:
 
-			TunnelConfig (const std::vector<std::shared_ptr<const i2p::data::IdentityEx> >& peers, 
+			TunnelConfig (const std::vector<std::shared_ptr<const i2p::data::IdentityEx> >& peers,
 				bool isShort = false): // inbound
 				m_IsShort (isShort)
 			{
@@ -121,7 +121,7 @@ namespace tunnel
 			}
 
 			bool IsShort () const { return m_IsShort; }
-			
+
 			TunnelHopConfig * GetFirstHop () const
 			{
 				return m_FirstHop;
@@ -203,12 +203,12 @@ namespace tunnel
 					if (m_IsShort)
 						hop = new ShortECIESTunnelHopConfig (it);
 					else
-					{	
+					{
 						if (it->GetCryptoKeyType () == i2p::data::CRYPTO_KEY_TYPE_ECIES_X25519_AEAD)
 							hop = new LongECIESTunnelHopConfig (it);
 						else
 							hop = new ElGamalTunnelHopConfig (it);
-					}	
+					}
 					if (prev)
 						prev->SetNext (hop);
 					else