diff --git a/shark.cpp b/shark.cpp
index 8721574b..99d63d21 100644
--- a/shark.cpp
+++ b/shark.cpp
@@ -15,20 +15,20 @@ NAMESPACE_BEGIN(CryptoPP)
 static word64 SHARKTransform(word64 a)
 {
 	static const byte iG[8][8] = {
-		0xe7, 0x30, 0x90, 0x85, 0xd0, 0x4b, 0x91, 0x41, 
-		0x53, 0x95, 0x9b, 0xa5, 0x96, 0xbc, 0xa1, 0x68, 
-		0x02, 0x45, 0xf7, 0x65, 0x5c, 0x1f, 0xb6, 0x52, 
-		0xa2, 0xca, 0x22, 0x94, 0x44, 0x63, 0x2a, 0xa2, 
-		0xfc, 0x67, 0x8e, 0x10, 0x29, 0x75, 0x85, 0x71, 
-		0x24, 0x45, 0xa2, 0xcf, 0x2f, 0x22, 0xc1, 0x0e, 
-		0xa1, 0xf1, 0x71, 0x40, 0x91, 0x27, 0x18, 0xa5, 
-		0x56, 0xf4, 0xaf, 0x32, 0xd2, 0xa4, 0xdc, 0x71, 
+		0xe7, 0x30, 0x90, 0x85, 0xd0, 0x4b, 0x91, 0x41,
+		0x53, 0x95, 0x9b, 0xa5, 0x96, 0xbc, 0xa1, 0x68,
+		0x02, 0x45, 0xf7, 0x65, 0x5c, 0x1f, 0xb6, 0x52,
+		0xa2, 0xca, 0x22, 0x94, 0x44, 0x63, 0x2a, 0xa2,
+		0xfc, 0x67, 0x8e, 0x10, 0x29, 0x75, 0x85, 0x71,
+		0x24, 0x45, 0xa2, 0xcf, 0x2f, 0x22, 0xc1, 0x0e,
+		0xa1, 0xf1, 0x71, 0x40, 0x91, 0x27, 0x18, 0xa5,
+		0x56, 0xf4, 0xaf, 0x32, 0xd2, 0xa4, 0xdc, 0x71,
 	};
 
 	word64 result=0;
 	GF256 gf256(0xf5);
 	for (unsigned int i=0; i<8; i++)
-		for(unsigned int j=0; j<8; j++) 
+		for(unsigned int j=0; j<8; j++)
 			result ^= word64(gf256.Multiply(iG[i][j], GF256::Element(a>>(56-8*j)))) << (56-8*i);
 	return result;
 }
@@ -100,17 +100,17 @@ inline SharkProcessAndXorBlock(const word64 *roundKeys, unsigned int rounds, con
 	word64 tmp = *(word64 *)(void *)inBlock ^ roundKeys[0];
 
 	ByteOrder order = GetNativeByteOrder();
-	tmp = cbox[0][GetByte(order, tmp, 0)] ^ cbox[1][GetByte(order, tmp, 1)] 
-		^ cbox[2][GetByte(order, tmp, 2)] ^ cbox[3][GetByte(order, tmp, 3)] 
-		^ cbox[4][GetByte(order, tmp, 4)] ^ cbox[5][GetByte(order, tmp, 5)] 
+	tmp = cbox[0][GetByte(order, tmp, 0)] ^ cbox[1][GetByte(order, tmp, 1)]
+		^ cbox[2][GetByte(order, tmp, 2)] ^ cbox[3][GetByte(order, tmp, 3)]
+		^ cbox[4][GetByte(order, tmp, 4)] ^ cbox[5][GetByte(order, tmp, 5)]
 		^ cbox[6][GetByte(order, tmp, 6)] ^ cbox[7][GetByte(order, tmp, 7)]
 		^ roundKeys[1];
 
-	for(unsigned int i=2; i<rounds; i++) 
+	for(unsigned int i=2; i<rounds; i++)
 	{
-		tmp = cbox[0][GETBYTE(tmp, 7)] ^ cbox[1][GETBYTE(tmp, 6)] 
-			^ cbox[2][GETBYTE(tmp, 5)] ^ cbox[3][GETBYTE(tmp, 4)] 
-			^ cbox[4][GETBYTE(tmp, 3)] ^ cbox[5][GETBYTE(tmp, 2)] 
+		tmp = cbox[0][GETBYTE(tmp, 7)] ^ cbox[1][GETBYTE(tmp, 6)]
+			^ cbox[2][GETBYTE(tmp, 5)] ^ cbox[3][GETBYTE(tmp, 4)]
+			^ cbox[4][GETBYTE(tmp, 3)] ^ cbox[5][GETBYTE(tmp, 2)]
 			^ cbox[6][GETBYTE(tmp, 1)] ^ cbox[7][GETBYTE(tmp, 0)]
 			^ roundKeys[i];
 	}
diff --git a/shark.h b/shark.h
index 8d1b6e71..0998011a 100644
--- a/shark.h
+++ b/shark.h
@@ -14,7 +14,7 @@ NAMESPACE_BEGIN(CryptoPP)
 
 //! \class SHARK_Info
 //! \brief SHARK block cipher information
-struct SHARK_Info : public FixedBlockSize<8>, public VariableKeyLength<16, 1, 16>, public VariableRounds<6, 2>
+struct SHARK_Info : public FixedBlockSize<8>, public FixedKeyLength<16>, public VariableRounds<6, 2>
 {
 	static const char *StaticAlgorithmName() {return "SHARK-E";}
 };