diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/ArchiveCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/ArchiveCommand.java
index ab94d3a80..3ae0666b4 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/api/ArchiveCommand.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/ArchiveCommand.java
@@ -46,13 +46,9 @@ import java.io.Closeable;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.text.MessageFormat;
-import java.util.Collection;
-import java.util.Iterator;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
-import org.eclipse.jgit.api.Git;
-import org.eclipse.jgit.api.GitCommand;
 import org.eclipse.jgit.api.errors.GitAPIException;
 import org.eclipse.jgit.api.errors.JGitInternalException;
 import org.eclipse.jgit.internal.JGitText;
@@ -243,7 +239,7 @@ public class ArchiveCommand extends GitCommand<OutputStream> {
 				for (String sfx : fmt.suffixes())
 					if (filenameSuffix.endsWith(sfx))
 						return fmt;
-		return lookupFormat("tar");
+		return lookupFormat("tar"); //$NON-NLS-1$
 	}
 
 	private static Format<?> lookupFormat(String formatName) throws UnsupportedFormatException {
@@ -334,20 +330,20 @@ public class ArchiveCommand extends GitCommand<OutputStream> {
 	}
 
 	/**
-	 * Set the intended filename for the produced archive.
-	 * Currently the only effect is to determine the default
-	 * archive format when none is specified with
-	 * {@link #setFormat(String)}.
+	 * Set the intended filename for the produced archive. Currently the only
+	 * effect is to determine the default archive format when none is specified
+	 * with {@link #setFormat(String)}.
 	 *
 	 * @param filename
-	 *		intended filename for the archive
+	 *            intended filename for the archive
+	 * @return this
 	 */
 	public ArchiveCommand setFilename(String filename) {
 		int slash = filename.lastIndexOf('/');
 		int dot = filename.indexOf('.', slash + 1);
 
 		if (dot == -1)
-			this.suffix = "";
+			this.suffix = ""; //$NON-NLS-1$
 		else
 			this.suffix = filename.substring(dot);
 		return this;