diff --git a/core/java/src/net/i2p/crypto/elgamal/impl/ElGamalPrivateKeyImpl.java b/core/java/src/net/i2p/crypto/elgamal/impl/ElGamalPrivateKeyImpl.java
index 9460e6bb9..a1cffce7e 100644
--- a/core/java/src/net/i2p/crypto/elgamal/impl/ElGamalPrivateKeyImpl.java
+++ b/core/java/src/net/i2p/crypto/elgamal/impl/ElGamalPrivateKeyImpl.java
@@ -16,11 +16,10 @@ import net.i2p.crypto.elgamal.spec.ElGamalPrivateKeySpec;
 public class ElGamalPrivateKeyImpl
     implements ElGamalPrivateKey, DHPrivateKey
 {
-    static final long serialVersionUID = 4819350091141529678L;
+    private static final long serialVersionUID = 4819350091141529678L;
         
-    BigInteger      x;
-
-    ElGamalParameterSpec   elSpec;
+    private BigInteger x;
+    private ElGamalParameterSpec elSpec;
 
     protected ElGamalPrivateKeyImpl()
     {
diff --git a/core/java/src/net/i2p/crypto/elgamal/impl/ElGamalPublicKeyImpl.java b/core/java/src/net/i2p/crypto/elgamal/impl/ElGamalPublicKeyImpl.java
index 2fd16732c..e43bb6d20 100644
--- a/core/java/src/net/i2p/crypto/elgamal/impl/ElGamalPublicKeyImpl.java
+++ b/core/java/src/net/i2p/crypto/elgamal/impl/ElGamalPublicKeyImpl.java
@@ -16,7 +16,7 @@ import net.i2p.crypto.elgamal.spec.ElGamalPublicKeySpec;
 public class ElGamalPublicKeyImpl
     implements ElGamalPublicKey, DHPublicKey
 {
-    static final long serialVersionUID = 8712728417091216948L;
+    private static final long serialVersionUID = 8712728417091216948L;
         
     private BigInteger              y;
     private ElGamalParameterSpec    elSpec;
diff --git a/core/java/src/net/i2p/crypto/elgamal/spec/ElGamalGenParameterSpec.java b/core/java/src/net/i2p/crypto/elgamal/spec/ElGamalGenParameterSpec.java
index e2cbc3d6a..8a404d091 100644
--- a/core/java/src/net/i2p/crypto/elgamal/spec/ElGamalGenParameterSpec.java
+++ b/core/java/src/net/i2p/crypto/elgamal/spec/ElGamalGenParameterSpec.java
@@ -5,7 +5,7 @@ import java.security.spec.AlgorithmParameterSpec;
 public class ElGamalGenParameterSpec
     implements AlgorithmParameterSpec
 {
-    private int primeSize;
+    private final int primeSize;
 
     /*
      * @param primeSize the size (in bits) of the prime modulus.
diff --git a/core/java/src/net/i2p/crypto/elgamal/spec/ElGamalKeySpec.java b/core/java/src/net/i2p/crypto/elgamal/spec/ElGamalKeySpec.java
index 4817e4699..4d20d32a4 100644
--- a/core/java/src/net/i2p/crypto/elgamal/spec/ElGamalKeySpec.java
+++ b/core/java/src/net/i2p/crypto/elgamal/spec/ElGamalKeySpec.java
@@ -5,7 +5,7 @@ import java.security.spec.KeySpec;
 public class ElGamalKeySpec
     implements KeySpec
 {
-    private ElGamalParameterSpec  spec;
+    private final ElGamalParameterSpec  spec;
 
     public ElGamalKeySpec(
         ElGamalParameterSpec  spec)
diff --git a/core/java/src/net/i2p/crypto/elgamal/spec/ElGamalPrivateKeySpec.java b/core/java/src/net/i2p/crypto/elgamal/spec/ElGamalPrivateKeySpec.java
index 03b292166..014c57941 100644
--- a/core/java/src/net/i2p/crypto/elgamal/spec/ElGamalPrivateKeySpec.java
+++ b/core/java/src/net/i2p/crypto/elgamal/spec/ElGamalPrivateKeySpec.java
@@ -10,7 +10,7 @@ import java.math.BigInteger;
 public class ElGamalPrivateKeySpec
     extends ElGamalKeySpec
 {
-    private BigInteger  x;
+    private final BigInteger x;
 
     public ElGamalPrivateKeySpec(
         BigInteger              x,
diff --git a/core/java/src/net/i2p/crypto/elgamal/spec/ElGamalPublicKeySpec.java b/core/java/src/net/i2p/crypto/elgamal/spec/ElGamalPublicKeySpec.java
index e2e20e993..4b68686e1 100644
--- a/core/java/src/net/i2p/crypto/elgamal/spec/ElGamalPublicKeySpec.java
+++ b/core/java/src/net/i2p/crypto/elgamal/spec/ElGamalPublicKeySpec.java
@@ -10,7 +10,7 @@ import java.math.BigInteger;
 public class ElGamalPublicKeySpec
     extends ElGamalKeySpec
 {
-    private BigInteger  y;
+    private final BigInteger y;
 
     public ElGamalPublicKeySpec(
         BigInteger              y,