diff --git a/pmd/src/main/java/net/sourceforge/pmd/cpd/AnyTokenizer.java b/pmd/src/main/java/net/sourceforge/pmd/cpd/AnyTokenizer.java
index 931a639558..a63d5b78ca 100644
--- a/pmd/src/main/java/net/sourceforge/pmd/cpd/AnyTokenizer.java
+++ b/pmd/src/main/java/net/sourceforge/pmd/cpd/AnyTokenizer.java
@@ -19,7 +19,7 @@ public class AnyTokenizer implements Tokenizer {
     public static final String TOKENS = " \t!#$%^&*(){}-=+<>/\\`~;:";
 
     public void tokenize(SourceCode sourceCode, Tokens tokenEntries) {
-        StringBuffer sb = sourceCode.getCodeBuffer();
+        StringBuilder sb = sourceCode.getCodeBuffer();
         BufferedReader reader = new BufferedReader(new CharArrayReader(sb.toString().toCharArray()));
         try {
             int lineNumber = 1;
diff --git a/pmd/src/main/java/net/sourceforge/pmd/cpd/CPPTokenizer.java b/pmd/src/main/java/net/sourceforge/pmd/cpd/CPPTokenizer.java
index d36fed5105..48c3362a61 100644
--- a/pmd/src/main/java/net/sourceforge/pmd/cpd/CPPTokenizer.java
+++ b/pmd/src/main/java/net/sourceforge/pmd/cpd/CPPTokenizer.java
@@ -15,7 +15,7 @@ import net.sourceforge.pmd.util.IOUtil;
 public class CPPTokenizer implements Tokenizer {
 
 	public void tokenize(SourceCode sourceCode, Tokens tokenEntries) {
-		StringBuffer buffer = sourceCode.getCodeBuffer();
+		StringBuilder buffer = sourceCode.getCodeBuffer();
 		StringReader reader = null;
 		try {
 			LanguageVersionHandler languageVersionHandler = LanguageVersion.CPP.getLanguageVersionHandler();
diff --git a/pmd/src/main/java/net/sourceforge/pmd/cpd/JSPTokenizer.java b/pmd/src/main/java/net/sourceforge/pmd/cpd/JSPTokenizer.java
index 0c99b08d9d..be59888ede 100644
--- a/pmd/src/main/java/net/sourceforge/pmd/cpd/JSPTokenizer.java
+++ b/pmd/src/main/java/net/sourceforge/pmd/cpd/JSPTokenizer.java
@@ -13,7 +13,7 @@ import net.sourceforge.pmd.lang.jsp.ast.Token;
 public class JSPTokenizer implements Tokenizer {
 
     public void tokenize(SourceCode sourceCode, Tokens tokenEntries) {
-	StringBuffer buffer = sourceCode.getCodeBuffer();
+	StringBuilder buffer = sourceCode.getCodeBuffer();
 	LanguageVersionHandler languageVersionHandler = Language.JSP.getDefaultVersion().getLanguageVersionHandler();
 	TokenManager tokenMgr = languageVersionHandler.getParser(languageVersionHandler.getDefaultParserOptions())
 		.getTokenManager(sourceCode.getFileName(), new StringReader(buffer.toString()));
diff --git a/pmd/src/main/java/net/sourceforge/pmd/cpd/JavaTokenizer.java b/pmd/src/main/java/net/sourceforge/pmd/cpd/JavaTokenizer.java
index 4724274310..45d554a982 100644
--- a/pmd/src/main/java/net/sourceforge/pmd/cpd/JavaTokenizer.java
+++ b/pmd/src/main/java/net/sourceforge/pmd/cpd/JavaTokenizer.java
@@ -26,7 +26,7 @@ public class JavaTokenizer implements Tokenizer {
     }
 
     public void tokenize(SourceCode sourceCode, Tokens tokenEntries) {
-	StringBuffer buffer = sourceCode.getCodeBuffer();
+	StringBuilder buffer = sourceCode.getCodeBuffer();
 
 	/*
 	I'm doing a sort of State pattern thing here where
diff --git a/pmd/src/main/java/net/sourceforge/pmd/cpd/SourceCode.java b/pmd/src/main/java/net/sourceforge/pmd/cpd/SourceCode.java
index 653650e36c..51115b9f42 100644
--- a/pmd/src/main/java/net/sourceforge/pmd/cpd/SourceCode.java
+++ b/pmd/src/main/java/net/sourceforge/pmd/cpd/SourceCode.java
@@ -113,12 +113,11 @@ public class SourceCode {
 	return cl.getCode();
     }
 
-    public StringBuffer getCodeBuffer() {
-	StringBuffer sb = new StringBuffer();
+    public StringBuilder getCodeBuffer() {
+	StringBuilder sb = new StringBuilder();
 	List<String> lines = cl.getCode();
 	for (String line : lines) {
-	    sb.append(line);
-	    sb.append(PMD.EOL);
+	    sb.append(line).append(PMD.EOL);
 	}
 	return sb;
     }
diff --git a/pmd/src/main/java/net/sourceforge/pmd/util/TypeMap.java b/pmd/src/main/java/net/sourceforge/pmd/util/TypeMap.java
index 8135da32de..270e5f9e95 100644
--- a/pmd/src/main/java/net/sourceforge/pmd/util/TypeMap.java
+++ b/pmd/src/main/java/net/sourceforge/pmd/util/TypeMap.java
@@ -137,7 +137,7 @@ public class TypeMap {
      * @param value
      */
     private void storeShortest(Map<Class<?>, String> map, Class<?> key, String value) {
-        String existingValue = (String) map.get(key);
+        String existingValue = map.get(key);
 
         if (existingValue == null) {
             map.put(key, value);