diff --git a/src/main/java/net/sf/jabref/gui/FindUnlinkedFilesDialog.java b/src/main/java/net/sf/jabref/gui/FindUnlinkedFilesDialog.java
index 08ba04dac05..ec590244761 100644
--- a/src/main/java/net/sf/jabref/gui/FindUnlinkedFilesDialog.java
+++ b/src/main/java/net/sf/jabref/gui/FindUnlinkedFilesDialog.java
@@ -1110,9 +1110,6 @@ private static class BibtexEntryTypeWrapper {
             this.entryType = bibtexType;
         }
 
-        /* (non-Javadoc)
-         * @see java.lang.Object#toString()
-         */
         @Override
         public String toString() {
             if (entryType == null) {
diff --git a/src/main/java/net/sf/jabref/importer/UnlinkedFilesCrawler.java b/src/main/java/net/sf/jabref/importer/UnlinkedFilesCrawler.java
index 2ec53ca4fc2..710fcb2c98b 100644
--- a/src/main/java/net/sf/jabref/importer/UnlinkedFilesCrawler.java
+++ b/src/main/java/net/sf/jabref/importer/UnlinkedFilesCrawler.java
@@ -11,17 +11,17 @@
 import net.sf.jabref.gui.FindUnlinkedFilesDialog.FileNodeWrapper;
 
 /**
- * Util class for searching files on the filessystem which are not linked to a
+ * Util class for searching files on the file system which are not linked to a
  * provided {@link BibDatabase}.
- * 
+ *
  * @author Nosh&Dan
  * @version 09.11.2008 | 19:55:20
- * 
+ *
  */
 public class UnlinkedFilesCrawler {
 
     /**
-     * File filter, that accepts directorys only.
+     * File filter, that accepts directories only.
      */
     private final FileFilter directoryFilter = new FileFilter() {
 
@@ -38,7 +38,7 @@ public boolean accept(File pathname) {
 
     /**
      * CONSTRUCTOR
-     * 
+     *
      * @param database
      */
     public UnlinkedFilesCrawler(BibDatabase database) {
@@ -60,20 +60,20 @@ public CheckableTreeNode searchDirectory(File directory, FileFilter aFileFilter)
      * {@link CheckableTreeNode}. <br>
      * <br>
      * The user objects that are attached to the nodes is the
-     * {@link FileNodeWrapper}, which wrapps the {@link File}-Object. <br>
+     * {@link FileNodeWrapper}, which wraps the {@link File}-Object. <br>
      * <br>
      * For ensuring the capability to cancel the work of this recursive method,
      * the first position in the integer array 'state' must be set to 1, to keep
-     * the recursion running. When the states value changes, the methode will
+     * the recursion running. When the states value changes, the method will
      * resolve its recursion and return what it has saved so far.
      */
     public CheckableTreeNode searchDirectory(File directory, UnlinkedPDFFileFilter ff, int[] state, ChangeListener changeListener) {
         /* Cancellation of the search from outside! */
-        if (state == null || state.length < 1 || state[0] != 1) {
+        if ((state == null) || (state.length < 1) || (state[0] != 1)) {
             return null;
         }
         /* Return null if the directory is not valid. */
-        if (directory == null || !directory.exists() || !directory.isDirectory()) {
+        if ((directory == null) || !directory.exists() || !directory.isDirectory()) {
             return null;
         }
 
@@ -85,7 +85,7 @@ public CheckableTreeNode searchDirectory(File directory, UnlinkedPDFFileFilter f
         File[] subDirectories = directory.listFiles(directoryFilter);
         for (File subDirectory : subDirectories) {
             CheckableTreeNode subRoot = searchDirectory(subDirectory, ff, state, changeListener);
-            if (subRoot != null && subRoot.getChildCount() > 0) {
+            if ((subRoot != null) && (subRoot.getChildCount() > 0)) {
                 filesCount += ((FileNodeWrapper) subRoot.getUserObject()).fileCount;
                 root.add(subRoot);
             }
diff --git a/src/test/java/net/sf/jabref/importer/DatabaseFileLookupTest.java b/src/test/java/net/sf/jabref/importer/DatabaseFileLookupTest.java
index 3c55360a61d..e0e7be50fe7 100644
--- a/src/test/java/net/sf/jabref/importer/DatabaseFileLookupTest.java
+++ b/src/test/java/net/sf/jabref/importer/DatabaseFileLookupTest.java
@@ -34,9 +34,6 @@ public class DatabaseFileLookupTest {
     private BibEntry entry2;
 
 
-    /* (non-Javadoc)
-     * @see junit.framework.TestCase#setUp()
-     */
     @Before
     public void setUp() throws Exception {
         try (FileReader fr = new FileReader(ImportDataTest.UNLINKED_FILES_TEST_BIB)) {
@@ -63,7 +60,6 @@ public void testTestDatabase() throws Exception {
     @Test
     @Ignore
     public void testInsertTestData() throws Exception {
-
         entry1 = new BibEntry();
         JabRefPreferences jabRefPreferences = JabRefPreferences.getInstance();
         ExternalFileType fileType = jabRefPreferences.getExternalFileTypeByExt("PDF");