diff --git a/src/java/com/samskivert/io/StreamUtil.java b/src/java/com/samskivert/io/StreamUtil.java
index e62fc5c9..514270e6 100644
--- a/src/java/com/samskivert/io/StreamUtil.java
+++ b/src/java/com/samskivert/io/StreamUtil.java
@@ -138,7 +138,7 @@ public class StreamUtil
         throws IOException
     {
         char[] inbuf = new char[4096];
-        StringBuffer outbuf = new StringBuffer();
+        StringBuilder outbuf = new StringBuilder();
         for (int read = 0; (read = reader.read(inbuf)) > 0; ) {
             outbuf.append(inbuf, 0, read);
         }
diff --git a/src/java/com/samskivert/net/MailUtil.java b/src/java/com/samskivert/net/MailUtil.java
index 5f361ca1..25ce2d9e 100644
--- a/src/java/com/samskivert/net/MailUtil.java
+++ b/src/java/com/samskivert/net/MailUtil.java
@@ -29,13 +29,10 @@ import javax.mail.Transport;
 import javax.mail.internet.InternetAddress;
 import javax.mail.internet.MimeMessage;
 
-import java.util.regex.PatternSyntaxException;
 import java.util.regex.Pattern;
 
 import com.samskivert.util.StringUtil;
 
-import static com.samskivert.Log.log;
-
 /**
  * The mail util class encapsulates some utility functions related to
  * sending emails.
@@ -139,9 +136,8 @@ public class MailUtil
     {
         try {
             message.setFrom(new InternetAddress(sender));
-            for (int ii = 0; ii < recipients.length; ii++) {
-                message.addRecipient(Message.RecipientType.TO,
-                                     new InternetAddress(recipients[ii]));
+            for (String recipient : recipients) {
+                message.addRecipient(Message.RecipientType.TO, new InternetAddress(recipient));
             }
             if (subject != null) {
                 message.setSubject(subject);
diff --git a/src/java/com/samskivert/net/cddb/CDDB.java b/src/java/com/samskivert/net/cddb/CDDB.java
index 006d768d..dbc7afcc 100644
--- a/src/java/com/samskivert/net/cddb/CDDB.java
+++ b/src/java/com/samskivert/net/cddb/CDDB.java
@@ -25,7 +25,6 @@ import java.net.InetAddress;
 import java.net.Socket;
 import java.net.SocketException;
 import java.util.ArrayList;
-import java.util.StringTokenizer;
 
 /**
  * The CDDB class provides access to the information provided by servers compliant with the
@@ -225,8 +224,8 @@ public class CDDB
         StringBuilder req = new StringBuilder("cddb query ");
         req.append(discid).append(" ");
         req.append(frameOffsets.length).append(" ");
-        for (int i = 0; i < frameOffsets.length; i++) {
-            req.append(frameOffsets[i]).append(" ");
+        for (int frameOffset : frameOffsets) {
+            req.append(frameOffsets).append(" ");
         }
         req.append(length);