diff --git a/bitrepository-alarm-service/src/license/THIRD-PARTY.properties b/bitrepository-alarm-service/src/license/THIRD-PARTY.properties
index 4f91e7094..f97cbef53 100644
--- a/bitrepository-alarm-service/src/license/THIRD-PARTY.properties
+++ b/bitrepository-alarm-service/src/license/THIRD-PARTY.properties
@@ -1,6 +1,6 @@
 ###
 # #%L
-# Bitrepository Alarm Service
+# BitRepository Alarm Service
 # %%
 # Copyright (C) 2010 - 2013 The State and University Library, The Royal Library and The State Archives, Denmark
 # %%
diff --git a/bitrepository-alarm-service/src/main/assembly/assembly.xml b/bitrepository-alarm-service/src/main/assembly/assembly.xml
index 908f02075..bd845407d 100644
--- a/bitrepository-alarm-service/src/main/assembly/assembly.xml
+++ b/bitrepository-alarm-service/src/main/assembly/assembly.xml
@@ -1,6 +1,6 @@
 <!--
   #%L
-  Bitrepository Reference Pillar
+  BitRepository Reference Pillar
   
   $Id$
   $HeadURL$
diff --git a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/AlarmException.java b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/AlarmException.java
index 69496dd95..ea2f2cd97 100644
--- a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/AlarmException.java
+++ b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/AlarmException.java
@@ -1,23 +1,23 @@
 /*
  * #%L
  * bitrepository-access-client
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -25,14 +25,15 @@
 package org.bitrepository.alarm;
 
 /**
- * Exception for the alarm module. Is thrown whenever a alarm cannot be handled.
+ * Exception for the alarm module. Is thrown whenever an alarm cannot be handled.
  */
 @SuppressWarnings("serial")
 public class AlarmException extends RuntimeException {
     /**
      * Constructor for this exception with both text message and a cause.
+     *
      * @param message The message for the exception.
-     * @param cause The cause in the form of another Throwable which has triggered this exception.
+     * @param cause   The cause in the form of another Throwable which has triggered this exception.
      */
     public AlarmException(String message, Throwable cause) {
         super(message, cause);
@@ -40,6 +41,7 @@ public AlarmException(String message, Throwable cause) {
 
     /**
      * Constructor for this exception based on a text message.
+     *
      * @param message The message for the exception.
      */
     public AlarmException(String message) {
diff --git a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/AlarmService.java b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/AlarmService.java
index 80f3064b0..e02666d78 100644
--- a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/AlarmService.java
+++ b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/AlarmService.java
@@ -8,54 +8,55 @@
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.alarm;
 
-import java.util.Collection;
-import java.util.Date;
-
 import org.bitrepository.alarm.handling.AlarmHandler;
 import org.bitrepository.bitrepositoryelements.Alarm;
 import org.bitrepository.bitrepositoryelements.AlarmCode;
 import org.bitrepository.service.LifeCycledService;
 
+import java.util.Collection;
+import java.util.Date;
+
 /**
  * The interface for an alarm service
  */
 public interface AlarmService extends LifeCycledService {
     /**
-     * Adds a handler for a specific queue. 
-     * 
+     * Adds a handler for a specific queue.
+     *
      * @param handler The handler for the Alarm messages.
      */
     void addHandler(AlarmHandler handler);
-    
+
     /**
-     * Extracts the alarms based on the given optional restictions.
-     * @param componentID [OPTIONAL] The id of the component.
-     * @param alarmCode [OPTIONAL] The alarm code.
-     * @param minDate [OPTIONAL] The earliest date for the alarms.
-     * @param maxDate [OPTIONAL] The latest date for the alarms.
-     * @param fileID [OPTIONAL] The id of the file, which the alarms are connected.
+     * Extracts the alarms based on the given optional restrictions.
+     *
+     * @param componentID  [OPTIONAL] The id of the component.
+     * @param alarmCode    [OPTIONAL] The alarm code.
+     * @param minDate      [OPTIONAL] The earliest date for the alarms.
+     * @param maxDate      [OPTIONAL] The latest date for the alarms.
+     * @param fileID       [OPTIONAL] The id of the file, which the alarms are connected.
      * @param collectionID [OPTIONAL] the collectionID, for which alarms are from
-     * @param maxResults [OPTIONAL] The maximum number of alarms to retrieve from the store.
-     * @param ascending Whether the alarms should be delivered ascending.
+     * @param maxResults   [OPTIONAL] The maximum number of alarms to retrieve from the store.
+     * @param ascending    Whether the alarms should be delivered ascending.
      * @return The requested collection of alarms from the store.
      */
-    Collection<Alarm> extractAlarms(String componentID, AlarmCode alarmCode, Date minDate, Date maxDate, 
-            String fileID, String collectionID, Integer maxResults, boolean ascending);
-    
+    Collection<Alarm> extractAlarms(String componentID, AlarmCode alarmCode, Date minDate, Date maxDate,
+                                    String fileID, String collectionID, Integer maxResults, boolean ascending);
+
 }
diff --git a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/AlarmServiceFactory.java b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/AlarmServiceFactory.java
index a1cb72f1b..420791334 100644
--- a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/AlarmServiceFactory.java
+++ b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/AlarmServiceFactory.java
@@ -8,31 +8,22 @@
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.alarm;
 
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Paths;
-import java.util.Properties;
-
 import org.bitrepository.alarm.handling.handlers.AlarmStorer;
 import org.bitrepository.alarm.store.AlarmDAOFactory;
 import org.bitrepository.alarm.store.AlarmStore;
@@ -47,42 +38,64 @@
 import org.bitrepository.service.contributor.SimpleContributorMediator;
 import org.bitrepository.settings.referencesettings.ServiceType;
 
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Paths;
+import java.util.Properties;
+
 /**
  * Class for launching an alarm service.
  */
 public class AlarmServiceFactory {
-    /** The alarm service. 
-     * @see #getAlarmService().*/
+    /**
+     * The alarm service.
+     *
+     * @see #getAlarmService().
+     */
     private static AlarmService alarmService;
-    /** The path to the directory containing the configuration files.*/
+    /**
+     * The path to the directory containing the configuration files.
+     */
     private static String configurationDir;
-    /** The path to the private key file.*/
+    /**
+     * The path to the private key file.
+     */
     private static String privateKeyFile;
-    
-    /** The properties file holding implementation specifics for the alarm service. */
-    private static final String CONFIGFILE = "alarmservice.properties";
-    /** Property key to tell where to locate the path and filename to the private key file. */
+
+    /**
+     * The properties file holding implementation specifics for the alarm service.
+     */
+    private static final String CONFIG_FILE = "alarmservice.properties";
+    /**
+     * Property key to tell where to locate the path and filename to the private key file.
+     */
     private static final String PRIVATE_KEY_FILE = "org.bitrepository.alarm-service.privateKeyFile";
-        
+
     /**
      * Private constructor as the class is meant to be used in a static way.
      */
-    private AlarmServiceFactory() { }
-    
+    private AlarmServiceFactory() {}
+
     /**
-     * Initialize the factory with configuration. 
+     * Initialize the factory with configuration.
+     *
      * @param confDir String containing the path to the AlarmService's configuration directory
      */
     public static synchronized void init(String confDir) {
         configurationDir = confDir;
     }
-    
+
     /**
-     * Factory method to retrieve AlarmService  
+     * Factory method to retrieve AlarmService
+     *
      * @return The AlarmService.
      */
     public static synchronized AlarmService getAlarmService() {
-        if(alarmService == null) {
+        if (alarmService == null) {
             SecurityManager securityManager;
             ServiceSettingsProvider settingsLoader =
                     new ServiceSettingsProvider(new XMLFileSettingsLoader(configurationDir), ServiceType.ALARM_SERVICE);
@@ -90,33 +103,34 @@ public static synchronized AlarmService getAlarmService() {
             Settings settings = settingsLoader.getSettings();
             try {
                 loadProperties();
-                securityManager = SecurityManagerUtil.getSecurityManager(settings, Paths.get(privateKeyFile), 
-                        settings.getReferenceSettings().getAlarmServiceSettings().getID()); 
-                MessageBus messageBus = ProtocolComponentFactory.getInstance().getMessageBus(settings, 
+                securityManager = SecurityManagerUtil.getSecurityManager(settings, Paths.get(privateKeyFile),
+                        settings.getReferenceSettings().getAlarmServiceSettings().getID());
+                MessageBus messageBus = ProtocolComponentFactory.getInstance().getMessageBus(settings,
                         securityManager);
                 ContributorMediator contributorMediator = new SimpleContributorMediator(messageBus, settings, null, null);
                 AlarmDAOFactory alarmDAOFactory = new AlarmDAOFactory();
                 AlarmStore store = alarmDAOFactory.getAlarmServiceDAOInstance(
                         settings.getReferenceSettings().getAlarmServiceSettings().getAlarmServiceDatabase());
                 alarmService = new BasicAlarmService(messageBus, settings, store, contributorMediator);
-                
+
                 // Add the default handler for putting the alarms into the database.
                 alarmService.addHandler(new AlarmStorer(store));
             } catch (IOException e) {
                 throw new RuntimeException(e);
             }
         }
-        
+
         return alarmService;
     }
-    
+
     /**
-     * Loads the properties.
+     * Loads the properties from the properties file found at {@link #CONFIG_FILE}.
+     *
      * @throws IOException If any input/output issues occurs.
      */
     private static void loadProperties() throws IOException {
         Properties properties = new Properties();
-        File propertiesFile = new File(configurationDir, CONFIGFILE);
+        File propertiesFile = new File(configurationDir, CONFIG_FILE);
         try (BufferedReader propertiesReader = new BufferedReader(
                 new InputStreamReader(new FileInputStream(propertiesFile), StandardCharsets.UTF_8))) {
             properties.load(propertiesReader);
diff --git a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/BasicAlarmService.java b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/BasicAlarmService.java
index a00f8b4d3..88b703fd4 100644
--- a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/BasicAlarmService.java
+++ b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/BasicAlarmService.java
@@ -8,16 +8,16 @@
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -39,36 +39,24 @@
 import java.util.Collection;
 import java.util.Date;
 
-/**
- * The basic alarm service
- */
 public class BasicAlarmService implements AlarmService {
-    /** The logger for the AlarmService.*/
-    private Logger log = LoggerFactory.getLogger(this.getClass());
-
-    /** The messagebus for the communication.*/
+    private final Logger log = LoggerFactory.getLogger(this.getClass());
     private final MessageBus messageBus;
-    
-    /** The store for the alarms.*/
     private final AlarmStore store;
-    /** The mediator for handling the messages.*/
     private final ContributorMediator contributorMediator;
-
-    /** The conversation mediator to keep track of the conversations.*/
     private final AlarmMediator alarmMediator;
 
     /**
-     * Constructor.
-     * @param messageBus The message bus.
-     * @param settings The settings.
-     * @param store The store for the alarms.
+     * @param messageBus          The message bus.
+     * @param settings            The settings.
+     * @param store               The store for the alarms.
      * @param contributorMediator The contributor
      */
     public BasicAlarmService(MessageBus messageBus, Settings settings, AlarmStore store, ContributorMediator contributorMediator) {
         this.messageBus = messageBus;
         this.store = store;
         this.contributorMediator = contributorMediator;
-        
+
         contributorMediator.start();
         alarmMediator = new AlarmMediator(messageBus, settings.getAlarmDestination());
     }
@@ -78,13 +66,13 @@ public void addHandler(AlarmHandler handler) {
         log.info("Adding handler '" + handler.getClass().getName() + "' for alarms.");
         alarmMediator.addHandler(handler);
     }
-    
+
     @Override
     public void shutdown() {
-        if(alarmMediator != null) {
+        if (alarmMediator != null) {
             alarmMediator.close();
         }
-        if(contributorMediator != null) {
+        if (contributorMediator != null) {
             contributorMediator.close();
         }
         if (store != null) {
@@ -94,7 +82,7 @@ public void shutdown() {
             messageBus.close();
             // TODO Kill any lingering timer threads
         } catch (JMSException e) {
-            log.info("Error during shutdown of messagebus ", e);
+            log.info("Error during shutdown of MessageBus ", e);
         }
     }
 
@@ -103,7 +91,7 @@ public void start() {}
 
     @Override
     public Collection<Alarm> extractAlarms(String componentID, AlarmCode alarmCode, Date minDate, Date maxDate,
-            String fileID, String collectionID, Integer maxResults, boolean ascending) {
+                                           String fileID, String collectionID, Integer maxResults, boolean ascending) {
         return store.extractAlarms(componentID, alarmCode, minDate, maxDate, fileID, collectionID, maxResults, ascending);
     }
 }
diff --git a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/alarmservice/AlarmServiceContextListener.java b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/alarmservice/AlarmServiceContextListener.java
index 2cf2580d4..5c89be790 100644
--- a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/alarmservice/AlarmServiceContextListener.java
+++ b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/alarmservice/AlarmServiceContextListener.java
@@ -1,23 +1,23 @@
 /*
  * #%L
  * Bitrepository Alarm Service
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
diff --git a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/alarmservice/AlarmServiceInput.java b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/alarmservice/AlarmServiceInput.java
index 319c1070c..a2fca633f 100644
--- a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/alarmservice/AlarmServiceInput.java
+++ b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/alarmservice/AlarmServiceInput.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2013 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -25,81 +25,81 @@
 
 @XmlRootElement
 public class AlarmServiceInput {
-	private String alarmCode;
-	private String collectionID;
-	private String fileID;
-	private String fromDate;
-	private String toDate;
+    private String alarmCode;
+    private String collectionID;
+    private String fileID;
+    private String fromDate;
+    private String toDate;
     private String reportingComponent;
-	private int maxAlarms;
-	private boolean oldestAlarmsFirst;
+    private int maxAlarms;
+    private boolean oldestAlarmsFirst;
 
-	
-	public AlarmServiceInput(){
-	}
 
-	public String getAlarmCode() {
-		return alarmCode;
-	}
+    public AlarmServiceInput() {
+    }
 
-	public void setAlarmCode(String alarmCode) {
-		this.alarmCode = alarmCode;
-	}
+    public String getAlarmCode() {
+        return alarmCode;
+    }
 
-	public String getCollectionID() {
-		return collectionID;
-	}
+    public void setAlarmCode(String alarmCode) {
+        this.alarmCode = alarmCode;
+    }
 
-	public void setCollectionID(String collectionID) {
-		this.collectionID = collectionID;
-	}
+    public String getCollectionID() {
+        return collectionID;
+    }
 
-	public String getFileID() {
-		return fileID;
-	}
+    public void setCollectionID(String collectionID) {
+        this.collectionID = collectionID;
+    }
 
-	public void setFileID(String fileID) {
-		this.fileID = fileID;
-	}
+    public String getFileID() {
+        return fileID;
+    }
 
-	public String getFromDate() {
-		return fromDate;
-	}
+    public void setFileID(String fileID) {
+        this.fileID = fileID;
+    }
 
-	public void setFromDate(String fromDate) {
-		this.fromDate = fromDate;
-	}
+    public String getFromDate() {
+        return fromDate;
+    }
 
-	public String getToDate() {
-		return toDate;
-	}
+    public void setFromDate(String fromDate) {
+        this.fromDate = fromDate;
+    }
 
-	public void setToDate(String toDate) {
-		this.toDate = toDate;
-	}
+    public String getToDate() {
+        return toDate;
+    }
 
-	public int getMaxAlarms() {
-		return maxAlarms;
-	}
+    public void setToDate(String toDate) {
+        this.toDate = toDate;
+    }
 
-	public void setMaxAlarms(int maxAlarms) {
-		this.maxAlarms = maxAlarms;
-	}
+    public int getMaxAlarms() {
+        return maxAlarms;
+    }
 
-	public boolean isOldestAlarmsFirst() {
-		return oldestAlarmsFirst;
-	}
+    public void setMaxAlarms(int maxAlarms) {
+        this.maxAlarms = maxAlarms;
+    }
 
-	public void setOldestAlarmsFirst(boolean oldestAlarmsFirst) {
-		this.oldestAlarmsFirst = oldestAlarmsFirst;
-	}
+    public boolean isOldestAlarmsFirst() {
+        return oldestAlarmsFirst;
+    }
 
-	public String getReportingComponent() {
-		return reportingComponent;
-	}
+    public void setOldestAlarmsFirst(boolean oldestAlarmsFirst) {
+        this.oldestAlarmsFirst = oldestAlarmsFirst;
+    }
 
-	public void setReportingComponent(String reportingComponent) {
-		this.reportingComponent = reportingComponent;
-	}
+    public String getReportingComponent() {
+        return reportingComponent;
+    }
+
+    public void setReportingComponent(String reportingComponent) {
+        this.reportingComponent = reportingComponent;
+    }
 
 }
diff --git a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/alarmservice/RestAlarmService.java b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/alarmservice/RestAlarmService.java
index 6492cd065..927a460b7 100644
--- a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/alarmservice/RestAlarmService.java
+++ b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/alarmservice/RestAlarmService.java
@@ -1,35 +1,34 @@
 /*
  * #%L
  * Bitrepository Alarm Service
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.alarm.alarmservice;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.List;
-import java.util.TimeZone;
-import java.util.stream.Collectors;
+import org.bitrepository.alarm.AlarmService;
+import org.bitrepository.alarm.AlarmServiceFactory;
+import org.bitrepository.bitrepositoryelements.Alarm;
+import org.bitrepository.bitrepositoryelements.AlarmCode;
+import org.bitrepository.common.utils.CalendarUtils;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DefaultValue;
@@ -38,71 +37,83 @@
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
-
-import org.bitrepository.alarm.AlarmService;
-import org.bitrepository.alarm.AlarmServiceFactory;
-import org.bitrepository.bitrepositoryelements.Alarm;
-import org.bitrepository.bitrepositoryelements.AlarmCode;
-import org.bitrepository.common.utils.CalendarUtils;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+import java.util.TimeZone;
+import java.util.stream.Collectors;
 
 @Path("/AlarmService")
 public class RestAlarmService {
     private AlarmService alarmService;
     private CalendarUtils calendarUtils = CalendarUtils.getInstance(TimeZone.getDefault());
-    
+
     public RestAlarmService() {
         alarmService = AlarmServiceFactory.getAlarmService();
-       
+
     }
-    
+
     /**
-     * getShortAlarmList exposes the possibility of getting the list of the most recent alarms  
-     * @return A string containing the data of the last alarms. 
+     * getShortAlarmList exposes the possibility of getting the list of the most recent alarms
+     *
+     * @return A string containing the data of the last alarms.
      */
     @GET
     @Path("/getShortAlarmList/")
     @Produces("application/json")
     public List<Alarm> getShortAlarmList() {
-        List<Alarm> alarmList = new ArrayList<>();
-        alarmList.addAll(alarmService.extractAlarms(null, null, null, null, null, null, 10, false));
+        List<Alarm> alarmList = new ArrayList<>(alarmService.extractAlarms(null, null, null, null,
+                null, null, 10, false));
         return alarmList;
     }
-    
+
     /**
-     * getFullAlarmList exposes the possibility of getting the list of all alarms received   
-     * @return A string containing the data of all alarms received. 
+     * getFullAlarmList exposes the possibility of getting the list of all alarms received
+     *
+     * @return A string containing the data of all alarms received.
      */
     @GET
     @Path("/getFullAlarmList/")
     @Produces("application/json")
     public List<Alarm> getFullAlarmList() {
-        List<Alarm> alarmList = new ArrayList<>();
-        alarmList.addAll(alarmService.extractAlarms(null, null, null, null, null, null, null, true));
+        List<Alarm> alarmList = new ArrayList<>(alarmService.extractAlarms(null, null, null, null,
+                null, null, null, true));
         return alarmList;
     }
-       
+
     @POST
     @Path("/queryAlarms/")
     @Consumes("application/x-www-form-urlencoded")
     @Produces("application/json")
     public List<WebAlarm> queryAlarms(
-            @FormParam("fromDate") String fromDate,
-            @FormParam("toDate") String toDate,
-            @FormParam("fileID") String fileID,
-            @FormParam("reportingComponent") String reportingComponent,
-            @FormParam("alarmCode") String alarmCode,
-            @FormParam("collectionID") String collectionID,
-            @DefaultValue("10") @FormParam("maxAlarms") Integer maxAlarms,
-            @DefaultValue("true") @FormParam ("oldestAlarmFirst") boolean oldestAlarmFirst) {
+            @FormParam("fromDate")
+                    String fromDate,
+            @FormParam("toDate")
+                    String toDate,
+            @FormParam("fileID")
+                    String fileID,
+            @FormParam("reportingComponent")
+                    String reportingComponent,
+            @FormParam("alarmCode")
+                    String alarmCode,
+            @FormParam("collectionID")
+                    String collectionID,
+            @DefaultValue("10")
+            @FormParam("maxAlarms")
+                    Integer maxAlarms,
+            @DefaultValue("true")
+            @FormParam("oldestAlarmFirst")
+                    boolean oldestAlarmFirst) {
         Date from = calendarUtils.makeStartDateObject(fromDate);
         Date to = calendarUtils.makeEndDateObject(toDate);
-        
-        Collection<Alarm> alarms = alarmService.extractAlarms(contentOrNull(reportingComponent), makeAlarmCode(alarmCode), 
-                from, to, contentOrNull(fileID), makeCollectionID(collectionID), maxAlarms, oldestAlarmFirst);
-        
-        return alarms.stream().map(a -> new WebAlarm(a)).collect(Collectors.toList());
+
+        Collection<Alarm> alarms = alarmService.extractAlarms(contentOrNull(reportingComponent), makeAlarmCode(alarmCode), from, to,
+                contentOrNull(fileID), makeCollectionID(collectionID), maxAlarms, oldestAlarmFirst);
+
+        return alarms.stream().map(WebAlarm::new).collect(Collectors.toList());
     }
-    
+
     @POST
     @Path("/queryAlarms/")
     @Consumes("application/json")
@@ -110,34 +121,36 @@ public List<WebAlarm> queryAlarms(
     public List<Alarm> queryAlarms(AlarmServiceInput input) {
         Date from = calendarUtils.makeStartDateObject(input.getFromDate());
         Date to = calendarUtils.makeEndDateObject(input.getToDate());
-       
-        Collection<Alarm> alarms = alarmService.extractAlarms(contentOrNull(input.getReportingComponent()), makeAlarmCode(input.getAlarmCode()),
-                from, to, contentOrNull(input.getFileID()), makeCollectionID(input.getCollectionID()), input.getMaxAlarms(), input.isOldestAlarmsFirst());
-       
+
+        Collection<Alarm> alarms = alarmService.extractAlarms(contentOrNull(input.getReportingComponent()),
+                makeAlarmCode(input.getAlarmCode()), from, to, contentOrNull(input.getFileID()), makeCollectionID(input.getCollectionID()),
+                input.getMaxAlarms(), input.isOldestAlarmsFirst());
+
         return new ArrayList<>(alarms);
-        
+
     }
-    
+
     private String makeCollectionID(String collectionID) {
-        if(collectionID.equals("ALL")) {
-           return null;
+        if (collectionID.equals("ALL")) {
+            return null;
         } else {
             return collectionID;
         }
     }
-    
+
     private AlarmCode makeAlarmCode(String alarmCodeStr) {
-        if(alarmCodeStr.equals("ALL")) {
+        if (alarmCodeStr.equals("ALL")) {
             return null;
         } else {
             return AlarmCode.fromValue(alarmCodeStr);
         }
-    } 
-    
+    }
+
     private String contentOrNull(String input) {
-        if(input != null && input.trim().isEmpty()) {
+        if (input != null && input.trim().isEmpty()) {
             return null;
         } else {
+            assert input != null;
             return input.trim();
         }
     }
diff --git a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/alarmservice/WebAlarm.java b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/alarmservice/WebAlarm.java
index c97a87087..ee8cc7a82 100644
--- a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/alarmservice/WebAlarm.java
+++ b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/alarmservice/WebAlarm.java
@@ -8,12 +8,12 @@
  * it under the terms of the GNU Lesser General Public License as
  * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
@@ -21,14 +21,14 @@
  */
 package org.bitrepository.alarm.alarmservice;
 
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
 import org.bitrepository.bitrepositoryelements.Alarm;
 import org.bitrepository.bitrepositoryelements.AlarmCode;
 import org.bitrepository.common.utils.CalendarUtils;
 import org.bitrepository.common.utils.TimeUtils;
 
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
 /**
  * Class to format alarms for web display
  */
@@ -41,52 +41,52 @@ public class WebAlarm {
     private String collectionID;
 
     public WebAlarm() {}
-    
+
     public WebAlarm(Alarm alarm) {
         collectionID = alarm.getCollectionID() == null ? "" : alarm.getCollectionID();
         origDateTime = TimeUtils.shortDate(CalendarUtils.convertFromXMLGregorianCalendar(alarm.getOrigDateTime()));
         alarmRaiser = alarm.getAlarmRaiser();
         alarmCode = alarm.getAlarmCode();
         alarmText = alarm.getAlarmText();
-        
+
     }
 
     @XmlElement(name = "origDateTime")
     public String getOrigDateTime() {
         return origDateTime;
     }
-    
+
     public void setOrigDateTime(String origDateTime) {
         this.origDateTime = origDateTime;
     }
-    
+
     @XmlElement(name = "alarmCode")
     public AlarmCode getAlarmCode() {
         return alarmCode;
     }
-    
+
     public void setAlarmCode(AlarmCode alarmCode) {
         this.alarmCode = alarmCode;
     }
-    
+
     @XmlElement(name = "alarmRaiser")
     public String getAlarmRaiser() {
         return alarmRaiser;
     }
-    
+
     public void setAlarmRaiser(String alarmRaiser) {
         this.alarmRaiser = alarmRaiser;
     }
-    
+
     @XmlElement(name = "alarmText")
     public String getAlarmText() {
         return alarmText;
     }
-    
+
     public void setAlarmText(String alarmText) {
         this.alarmText = alarmText;
-    }    
-    
+    }
+
     @XmlElement(name = "collectionID")
     public String getCollectionID() {
         return collectionID;
@@ -94,5 +94,5 @@ public String getCollectionID() {
 
     public void setCollectionID(String collectionID) {
         this.collectionID = collectionID;
-    }    
+    }
 }
\ No newline at end of file
diff --git a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/handling/AlarmHandler.java b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/handling/AlarmHandler.java
index f435198b9..506289950 100644
--- a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/handling/AlarmHandler.java
+++ b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/handling/AlarmHandler.java
@@ -8,16 +8,16 @@
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -30,13 +30,14 @@
  * Interface for alarm handling.
  */
 public interface AlarmHandler {
-    
+
     /**
      * Handle the actual alarm messages.
+     *
      * @param msg The message to handle.
      */
     void handleAlarm(AlarmMessage msg);
-    
+
     /**
      * Close the specific Alarm handler.
      */
diff --git a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/handling/AlarmMediator.java b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/handling/AlarmMediator.java
index aeb68fe08..27a3a2e62 100644
--- a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/handling/AlarmMediator.java
+++ b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/handling/AlarmMediator.java
@@ -8,24 +8,22 @@
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.alarm.handling;
 
-import java.util.ArrayList;
-import java.util.List;
 import org.bitrepository.bitrepositorymessages.AlarmMessage;
 import org.bitrepository.bitrepositorymessages.Message;
 import org.bitrepository.protocol.MessageContext;
@@ -34,35 +32,35 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Receives and distributes the messages to the handler.
  */
 public class AlarmMediator implements MessageListener {
-    /** The logger.*/
-    private Logger log = LoggerFactory.getLogger(this.getClass());
-    /** The handler. Where the received messages should be handled.*/
-    private List<AlarmHandler> handlers;
-    /** The messagebus for this mediator.*/
+    private final Logger log = LoggerFactory.getLogger(this.getClass());
+    private final List<AlarmHandler> handlers;
     private final MessageBus messageBus;
-    /** The destination to listen to.*/ 
     private final String destination;
 
     /**
-     * Constructor.
      * Sets the parameters of this mediator, and adds itself as a listener to the given destination.
-     * @param messageBus The messagebus for communication.
+     *
+     * @param messageBus          The messageBus for communication.
      * @param listenerDestination The destination where the handler should be listening for alarms.
      */
     public AlarmMediator(MessageBus messageBus, String listenerDestination) {
         this.messageBus = messageBus;
         this.destination = listenerDestination;
-        
+
         messageBus.addListener(listenerDestination, this, true);
         handlers = new ArrayList<>();
     }
-    
+
     /**
-     * Adds a given alarm handler to handle the .
+     * Adds a given AlarmHandler to the handlers array.
+     *
      * @param handler the handler
      */
     public void addHandler(AlarmHandler handler) {
@@ -71,21 +69,21 @@ public void addHandler(AlarmHandler handler) {
 
     @Override
     public void onMessage(Message msg, MessageContext messageContext) {
-        if(msg instanceof AlarmMessage) {
-            for(AlarmHandler handler : handlers) {
+        if (msg instanceof AlarmMessage) {
+            for (AlarmHandler handler : handlers) {
                 handler.handleAlarm((AlarmMessage) msg);
             }
         } else {
-            log.warn("Recieved unexpected message: '{}'", msg);
+            log.warn("Received unexpected message: '{}'", msg);
         }
     }
-    
+
     /**
-     * Close the handlers respectively and remove this mediator from the destination.
+     * Closes the handlers respectively and remove this mediator from the destination.
      */
     public void close() {
-        if(handlers != null) {
-            for(AlarmHandler handler : handlers) {
+        if (handlers != null) {
+            for (AlarmHandler handler : handlers) {
                 handler.close();
             }
             handlers.clear();
diff --git a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/handling/handlers/AlarmLogger.java b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/handling/handlers/AlarmLogger.java
index f90f58dd2..527b1a866 100644
--- a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/handling/handlers/AlarmLogger.java
+++ b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/handling/handlers/AlarmLogger.java
@@ -8,16 +8,16 @@
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -33,22 +33,26 @@
  * Very simple AlarmHandler, which just logs the alarms received.
  */
 public class AlarmLogger implements AlarmHandler {
-    
-    /** The logger to log the Alarms.*/
-    private Logger log = LoggerFactory.getLogger(this.getClass());
-    
-    /** Constructor. Nothing to initialize. */
-    public AlarmLogger() { 
-        log.debug("Instantiating the alarmhandler '" + this.getClass().getCanonicalName() + "'");
+
+    /**
+     * The logger to log the Alarms.
+     */
+    private final Logger log = LoggerFactory.getLogger(this.getClass());
+
+    /**
+     * Constructor. Nothing to initialize.
+     */
+    public AlarmLogger() {
+        log.debug("Instantiating the AlarmHandler '" + this.getClass().getCanonicalName() + "'");
     }
-    
+
     @Override
     public void handleAlarm(AlarmMessage msg) {
         log.info("ALARM: " + msg.toString());
     }
-    
+
     @Override
     public void close() {
-        log.debug("Closing the alarmhandler '" + this.getClass().getCanonicalName() + "'");
+        log.debug("Closing the AlarmHandler '" + this.getClass().getCanonicalName() + "'");
     }
 }
diff --git a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/handling/handlers/AlarmMailer.java b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/handling/handlers/AlarmMailer.java
index f200463c3..429d60ccf 100644
--- a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/handling/handlers/AlarmMailer.java
+++ b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/handling/handlers/AlarmMailer.java
@@ -8,68 +8,80 @@
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.alarm.handling.handlers;
 
-import java.net.InetAddress;
-import java.util.Date;
-import java.util.Properties;
-
-import javax.mail.Message;
-import javax.mail.MessagingException;
-import javax.mail.Session;
-import javax.mail.Transport;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeMessage;
-
 import org.bitrepository.alarm.AlarmException;
 import org.bitrepository.alarm.handling.AlarmHandler;
-//import org.bitrepository.alarm_service.alarmconfiguration.AlarmConfiguration;
-//import org.bitrepository.alarm_service.alarmconfiguration.AlarmConfiguration.MailingConfiguration;
 import org.bitrepository.bitrepositorymessages.AlarmMessage;
 import org.bitrepository.settings.referencesettings.AlarmServiceSettings;
 import org.bitrepository.settings.referencesettings.MailingConfiguration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.mail.Message;
+import javax.mail.MessagingException;
+import javax.mail.Session;
+import javax.mail.Transport;
+import javax.mail.internet.InternetAddress;
+import javax.mail.internet.MimeMessage;
+import java.net.InetAddress;
+import java.util.Date;
+import java.util.Properties;
+
 /**
  * A quite simple AlarmHandler, which sends an mail with the Alarm.
  * TODO have a setting for how often, a mail should be send.
  */
 public class AlarmMailer implements AlarmHandler {
-    
-    /** The logger to log the Alarms.*/
-    private Logger log = LoggerFactory.getLogger(this.getClass());
-    
-    /** The message receiver.*/
+
+    /**
+     * The logger to log the Alarms.
+     */
+    private final Logger log = LoggerFactory.getLogger(this.getClass());
+
+    /**
+     * The message receiver.
+     */
     private final String messageReceiver;
-    /** The message sender.*/
+    /**
+     * The message sender.
+     */
     private final String messageSender;
-    /** The mail server.*/
+    /**
+     * The mail server.
+     */
     private final String mailServer;
-    
-    /** The key for the MAIL_FROM_PROPERTY.*/
+
+    /**
+     * The key for the MAIL_FROM_PROPERTY.
+     */
     private static final String MAIL_FROM_PROPERTY_KEY = "mail.from";
-    /** The key for the MAIL_HOST_PROPERTY.*/
+    /**
+     * The key for the MAIL_HOST_PROPERTY.
+     */
     private static final String MAIL_HOST_PROPERTY_KEY = "mail.host";
-    /** The default mimetype of a mail.*/
+    /**
+     * The default mimetype of a mail.
+     */
     private static final String MIMETYPE = "text/plain";
-    
+
     /**
      * Constructor.
+     *
      * @param settings the AlarmServiceSettings
      */
     public AlarmMailer(AlarmServiceSettings settings) {
@@ -77,21 +89,21 @@ public AlarmMailer(AlarmServiceSettings settings) {
         this.messageReceiver = config.getMailReceiver();
         this.messageSender = config.getMailSender();
         this.mailServer = config.getMailServer();
-        log.debug("Instantiating the alarmhandler '" + this.getClass().getCanonicalName() + "'");
+        log.debug("Instantiating the AlarmHandler '" + this.getClass().getCanonicalName() + "'");
     }
-    
+
     @Override
     public void handleAlarm(AlarmMessage msg) {
         String subject = "Received alarm '" + msg.getAlarm() + "'";
-        log.info(subject + ":\n{}", msg.toString());
+        log.info(subject + ":\n{}", msg);
         sendMail(subject, msg.toString());
     }
-    
+
     /**
      * Method for sending a mail.
-     * 
+     * <p>
      * TODO: put into utility class?
-     * 
+     *
      * @param subject The subject of the mail.
      * @param content The content of the mail.
      */
@@ -99,35 +111,37 @@ private void sendMail(String subject, String content) {
         Properties props = makeMailProperties();
         Session session = Session.getDefaultInstance(props);
         Message msg = new MimeMessage(session);
-        
+
         addMailBody(content, msg);
         addMailHeader(subject, msg);
         sendMessage(msg);
     }
-    
+
     /**
      * Method for generating the properties of the mail.
+     *
      * @return The properties for the mail.
      */
     private Properties makeMailProperties() {
         Properties props = new Properties();
         props.put(MAIL_FROM_PROPERTY_KEY, messageSender);
         props.put(MAIL_HOST_PROPERTY_KEY, mailServer);
-        
+
         return props;
     }
-    
+
     /**
      * Method for generating the body of the mail.
+     *
      * @param content The content of the body.
-     * @param msg The message which should have the body.
+     * @param msg     The message which should have the body.
      */
     private void addMailBody(String content, Message msg) {
-        StringBuffer body = new StringBuffer();
+        StringBuilder body = new StringBuilder();
         try {
             // Make the body of the mail.
-            body.append("Host: " + InetAddress.getLocalHost().getCanonicalHostName() + "\n");
-            body.append("Date: " + new Date().toString() + "\n");
+            body.append("Host: ").append(InetAddress.getLocalHost().getCanonicalHostName()).append("\n");
+            body.append("Date: ").append(new Date()).append("\n");
             body.append(content);
             body.append("\n");
             msg.setContent(body.toString(), MIMETYPE);
@@ -135,30 +149,32 @@ private void addMailBody(String content, Message msg) {
             throw new AlarmException("Could not create mail body.", e);
         }
     }
-    
+
     /**
-     * Method for generating and adding the header to the mail. 
+     * Method for generating and adding the header to the mail.
+     *
      * @param subject The subject of the mail
-     * @param msg the message to modify
+     * @param msg     the message to modify
      */
     private void addMailHeader(String subject, Message msg) {
         try {
             msg.setSubject(subject);
             msg.setSentDate(new Date());
             msg.setFrom(new InternetAddress(messageSender));
-            
+
             addReceiversToMessage(msg);
         } catch (MessagingException e) {
             throw new AlarmException("Could not create header.", e);
         }
     }
-    
+
     /**
      * Method for adding the message receivers to the message.
-     * @param msg The message which should be have the receivers added.
+     *
+     * @param msg The message which should have the receivers added.
      */
     private void addReceiversToMessage(Message msg) {
-        // to might contain more than one e-mail address
+        // Might contain more than one e-mail address
         for (String toAddressS : messageReceiver.split(",")) {
             try {
                 InternetAddress toAddress = new InternetAddress(toAddressS.trim());
@@ -167,7 +183,7 @@ private void addReceiversToMessage(Message msg) {
                 throw new AlarmException("To address '" + toAddressS + "' is not a valid email address", e);
             }
         }
-        
+
         try {
             if (msg.getAllRecipients().length == 0) {
                 throw new AlarmException("No valid recipients in '" + messageReceiver + "'");
@@ -176,9 +192,10 @@ private void addReceiversToMessage(Message msg) {
             throw new AlarmException("Cannot handle recipients of the message '" + msg + "'", e);
         }
     }
-    
+
     /**
      * Method for sending the message.
+     *
      * @param msg The message to send.
      */
     private void sendMessage(Message msg) {
@@ -188,9 +205,9 @@ private void sendMessage(Message msg) {
             throw new AlarmException("Could not send email: " + msg, e);
         }
     }
-    
+
     @Override
     public void close() {
-        log.debug("Closing the alarmhandler '" + this.getClass().getCanonicalName() + "'");
+        log.debug("Closing the AlarmHandler '" + this.getClass().getCanonicalName() + "'");
     }
 }
diff --git a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/handling/handlers/AlarmStorer.java b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/handling/handlers/AlarmStorer.java
index e7bd5cc4b..6bed5ebab 100644
--- a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/handling/handlers/AlarmStorer.java
+++ b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/handling/handlers/AlarmStorer.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -32,19 +32,24 @@
  * The alarm handler, which just stores all the alarms in the AlarmStore.
  */
 public class AlarmStorer implements AlarmHandler {
-    /** The logger.*/
-    private Logger log = LoggerFactory.getLogger(this.getClass());
-    /** The store for storing the alarms.*/
+    /**
+     * The logger.
+     */
+    private final Logger log = LoggerFactory.getLogger(this.getClass());
+    /**
+     * The store for storing the alarms.
+     */
     private final AlarmStore store;
-    
+
     /**
      * Constructor.
-     * @param store The alarmstore to store the alarms.
+     *
+     * @param store The AlarmStore to store the alarms.
      */
     public AlarmStorer(AlarmStore store) {
         this.store = store;
     }
-    
+
     @Override
     public void handleAlarm(AlarmMessage message) {
         log.debug("Adding alarm from message '{}'", message);
@@ -52,10 +57,10 @@ public void handleAlarm(AlarmMessage message) {
         alarm.setCollectionID(message.getCollectionID());
         store.addAlarm(alarm);
     }
-    
+
     @Override
-    public void close() { 
-        log.debug("Closing the alarmhandler '" + this.getClass().getCanonicalName() + "'");
+    public void close() {
+        log.debug("Closing the AlarmHandler '" + this.getClass().getCanonicalName() + "'");
         store.shutdown();
     }
 }
diff --git a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/store/AlarmDAOFactory.java b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/store/AlarmDAOFactory.java
index 98dbb26bc..215c8b401 100644
--- a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/store/AlarmDAOFactory.java
+++ b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/store/AlarmDAOFactory.java
@@ -8,12 +8,12 @@
  * it under the terms of the GNU Lesser General Public License as
  * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
@@ -29,15 +29,15 @@
  * Factory class for obtaining the appropriate DAO for the specific database backend.
  */
 public class AlarmDAOFactory extends DatabaseFactory<AlarmServiceDAO> {
-    
+
     /**
      * Obtain an instance of AlarmServiceDAO appropriate for the specific database backend.
+     *
      * @param ds the specific database backend
      * @return an instance of AlarmServiceDAO appropriate for the specific database backend.
      */
     public AlarmServiceDAO getAlarmServiceDAOInstance(DatabaseSpecifics ds) {
-        AlarmServiceDAO dao = getDAOInstance(ds);
-        return dao;
+        return getDAOInstance(ds);
     }
 
     @Override
@@ -54,5 +54,5 @@ protected AlarmServiceDAO getPostgresDAO(DatabaseManager dm) {
     protected DatabaseManager getDatabaseManager(DatabaseSpecifics ds) {
         return new AlarmDatabaseManager(ds);
     }
-    
+
 }
diff --git a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/store/AlarmDatabaseConstants.java b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/store/AlarmDatabaseConstants.java
index 2c7ce2382..170861ba6 100644
--- a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/store/AlarmDatabaseConstants.java
+++ b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/store/AlarmDatabaseConstants.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -25,35 +25,63 @@
  * The constants for the AlarmService database.
  */
 public class AlarmDatabaseConstants {
-    /** Private constructor to prevent instantiation of this constants class.*/
-    private AlarmDatabaseConstants() { }
-    
-    /** The name of the Alarm table.*/
+    /**
+     * Private constructor to prevent instantiation of this constants class.
+     */
+    private AlarmDatabaseConstants() {}
+
+    /**
+     * The name of the Alarm table.
+     */
     public static final String ALARM_TABLE = "alarm";
-    /** The name of the guid field in the alarm table.*/
+    /**
+     * The name of the guid field in the alarm table.
+     */
     public static final String ALARM_GUID = "guid";
-    /** The name of the component guid field in the alarm table.*/
+    /**
+     * The name of the component guid field in the alarm table.
+     */
     public static final String ALARM_COMPONENT_GUID = "component_guid";
-    /** The name of the alarm code field in the alarm table.*/
+    /**
+     * The name of the alarm code field in the alarm table.
+     */
     public static final String ALARM_CODE = "alarm_code";
-    /** The name of the alarm text field in the alarm table.*/
+    /**
+     * The name of the alarm text field in the alarm table.
+     */
     public static final String ALARM_TEXT = "alarm_text";
-    /** The name of the alarm date field in the alarm table.*/
+    /**
+     * The name of the alarm date field in the alarm table.
+     */
     public static final String ALARM_DATE = "alarm_date";
-    /** The name of the file id field in the alarm table.*/
+    /**
+     * The name of the file id field in the alarm table.
+     */
     public static final String ALARM_FILE_ID = "file_id";
-    /** The name of the collection id field in the alarm table. */
+    /**
+     * The name of the collection id field in the alarm table.
+     */
     public static final String ALARM_COLLECTION_ID = "collection_id";
-    
-    /** The name of the component table.*/
+
+    /**
+     * The name of the component table.
+     */
     public static final String COMPONENT_TABLE = "component";
-    /** The name of the component guid field in the component table.*/
+    /**
+     * The name of the component guid field in the component table.
+     */
     public static final String COMPONENT_GUID = "component_guid";
-    /** The name of the component id field in the component table.*/
+    /**
+     * The name of the component id field in the component table.
+     */
     public static final String COMPONENT_ID = "component_id";
-    
-    /** The name of the version table entry for the alarm table.*/
+
+    /**
+     * The name of the version table entry for the alarm table.
+     */
     public final static String ALARM_TABLE_VERSION_ENTRY = "alarm";
-    /** The name of the version table entry for the database. */
+    /**
+     * The name of the version table entry for the database.
+     */
     public final static String ALARM_DATABASE_VERSION_ENTRY = "alarmservicedb";
 }
diff --git a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/store/AlarmDatabaseExtractionModel.java b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/store/AlarmDatabaseExtractionModel.java
index cd9c4956c..14a17df22 100644
--- a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/store/AlarmDatabaseExtractionModel.java
+++ b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/store/AlarmDatabaseExtractionModel.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -24,49 +24,67 @@
 import org.bitrepository.bitrepositoryelements.AlarmCode;
 
 import java.util.Date;
+import java.util.Objects;
 
 /**
  * Container for the extraction of data from the alarm database.
  */
 public class AlarmDatabaseExtractionModel {
 
-    /** @see #getComponentId().  */
+    /**
+     * @see #getComponentId().
+     */
     private String componentId;
 
-    /** @see #getAlarmCode().  */
+    /**
+     * @see #getAlarmCode().
+     */
     private AlarmCode alarmCode;
 
-    /** @see #getStartDate(). */
+    /**
+     * @see #getStartDate().
+     */
     private Date startDate;
 
-    /** @see #getEndDate(). */
+    /**
+     * @see #getEndDate().
+     */
     private Date endDate;
 
-    /** @see #getFileID(). . */
+    /**
+     * @see #getFileID(). .
+     */
     private String fileID;
 
-    /** @see #getMaxCount(). */
+    /**
+     * @see #getMaxCount().
+     */
     private int maxCount;
 
-    /** @see #getAscending().*/
+    /**
+     * @see #getAscending().
+     */
     private boolean ascending;
 
-    /** @see #getCollectionID(). */
+    /**
+     * @see #getCollectionID().
+     */
     private String collectionID;
-    
+
     /**
      * Constructor.
+     *
      * @param collectionID The id of the collection, may be null.
-     * @param componentId The id of the component.
-     * @param alarmCode The alarm code.
-     * @param startDate The earliest date to restrict the extraction.
-     * @param endDate The latest date to restrict the extraction.
-     * @param fileID The id of the file.
-     * @param maxCount The maximum count of alarms to extract. If null, then set to maximum value for Integer.
-     * @param ascending if true sorted in ascending order, otherwise descending
-     */
-    public AlarmDatabaseExtractionModel(String collectionID, String componentId, AlarmCode alarmCode, Date startDate, Date endDate, 
-            String fileID, Integer maxCount, boolean ascending) {
+     * @param componentId  The id of the component.
+     * @param alarmCode    The alarm code.
+     * @param startDate    The earliest date to restrict the extraction.
+     * @param endDate      The latest date to restrict the extraction.
+     * @param fileID       The id of the file.
+     * @param maxCount     The maximum count of alarms to extract. If null, then set to maximum value for Integer.
+     * @param ascending    if true sorted in ascending order, otherwise descending
+     */
+    public AlarmDatabaseExtractionModel(String collectionID, String componentId, AlarmCode alarmCode, Date startDate, Date endDate,
+                                        String fileID, Integer maxCount, boolean ascending) {
         this.collectionID = collectionID;
         this.componentId = componentId;
         this.alarmCode = alarmCode;
@@ -74,79 +92,82 @@ public AlarmDatabaseExtractionModel(String collectionID, String componentId, Ala
         this.endDate = endDate;
         this.fileID = fileID;
         this.ascending = ascending;
-        
-        if(maxCount != null) {
-            this.maxCount = maxCount;
-        } else {
-            this.maxCount = Integer.MAX_VALUE;
-        }
-    }
-    
-    /** Returns the id to identify this component.
+
+        this.maxCount = Objects.requireNonNullElse(maxCount, Integer.MAX_VALUE);
+    }
+
+    /**
+     * Returns the id to identify this component.
+     *
      * @return The componentId
      */
     public String getComponentId() {
         return componentId;
     }
-    
+
     /**
      * Sets the id to identify this component.
-     * @see #getComponentId()
+     *
      * @param componentId The new component id.
+     * @see #getComponentId()
      */
     public void setComponentId(String componentId) {
         this.componentId = componentId;
     }
-    
+
     /**
      * Returns the alarm code.
+     *
      * @return The alarmCode
      */
     public AlarmCode getAlarmCode() {
         return alarmCode;
     }
-    
+
     /**
-     * @see #getAlarmCode()
      * @param alarmCode The new alarm code.
+     * @see #getAlarmCode()
      */
     public void setAlarmCode(AlarmCode alarmCode) {
         this.alarmCode = alarmCode;
     }
-   
+
     /**
      * Return the starting date for this alarm.
+     *
      * @return The startDate;
      */
     public Date getStartDate() {
         return startDate;
     }
-    
+
     /**
-     * @see #getStartDate()
      * @param startDate The startDate.
+     * @see #getStartDate()
      */
     public void setStartDate(Date startDate) {
         this.startDate = startDate;
     }
-    
+
     /**
      * Returns the end date for the alarm.
+     *
      * @return The endDate;
      */
     public Date getEndDate() {
         return endDate;
     }
-    
+
     /**
      * Sets the end date for the alarm.
-     * @see #getEndDate()
+     *
      * @param endDate The endDate.
+     * @see #getEndDate()
      */
     public void setEndDate(Date endDate) {
         this.endDate = endDate;
-    }    
-    
+    }
+
     /**
      * Returns the file id for this alarm.
      *
@@ -155,56 +176,57 @@ public void setEndDate(Date endDate) {
     public String getFileID() {
         return fileID;
     }
-    
+
     /**
-     * @see #getFileID()
      * @param fileID The new file id.
+     * @see #getFileID()
      */
     public void setFileID(String fileID) {
         this.fileID = fileID;
     }
-    
+
     /**
      * Return the maximum count possible.
+     *
      * @return The maxCount;
      */
     public Integer getMaxCount() {
         return maxCount;
     }
-    
+
     /**
-     * @see #getMaxCount()
      * @param maxCount The new max count.
+     * @see #getMaxCount()
      */
     public void setMaxCount(Integer maxCount) {
         this.maxCount = maxCount;
     }
-    
+
     /**
      * @return Whether the results are delivered ascending (alternatively descending).
      */
     public boolean getAscending() {
         return ascending;
     }
-    
+
     /**
-     * @see #getAscending()
      * @param ascending Whether the results should be ascending (or alternatively descending).
+     * @see #getAscending()
      */
     public void setAscending(boolean ascending) {
         this.ascending = ascending;
-    }   
-    
+    }
+
     /**
-     * @return The ID of the collection. 
+     * @return The ID of the collection.
      */
     public String getCollectionID() {
         return collectionID;
     }
-    
+
     /**
-     * @see #getCollectionID()
      * @param collectionID The ID of the collection.
+     * @see #getCollectionID()
      */
     public void setCollectionID(String collectionID) {
         this.collectionID = collectionID;
diff --git a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/store/AlarmDatabaseExtractor.java b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/store/AlarmDatabaseExtractor.java
index f7a713751..71a021bec 100644
--- a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/store/AlarmDatabaseExtractor.java
+++ b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/store/AlarmDatabaseExtractor.java
@@ -5,38 +5,39 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.alarm.store;
 
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
 import org.bitrepository.bitrepositoryelements.Alarm;
 import org.bitrepository.bitrepositoryelements.AlarmCode;
 import org.bitrepository.common.ArgumentValidator;
+import org.bitrepository.common.utils.CalendarUtils;
 import org.bitrepository.service.database.DBConnector;
 import org.bitrepository.service.database.DatabaseUtils;
-import org.bitrepository.common.utils.CalendarUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
 import static org.bitrepository.alarm.store.AlarmDatabaseConstants.ALARM_CODE;
 import static org.bitrepository.alarm.store.AlarmDatabaseConstants.ALARM_COLLECTION_ID;
 import static org.bitrepository.alarm.store.AlarmDatabaseConstants.ALARM_COMPONENT_GUID;
@@ -50,240 +51,260 @@
 
 /**
  * Extractor for the alarms from the AlarmServiceDatabase.
- * 
+ * <p/>
  * Order of extraction:
- * ALARM_COMPONENT_GUID, 
- * ALARM_CODE, 
- * ALARM_TEXT, 
- * ALARM_DATE, 
+ * ALARM_COMPONENT_GUID,
+ * ALARM_CODE,
+ * ALARM_TEXT,
+ * ALARM_DATE,
  * ALARM_FILE_ID
  * ALARM_COLLECTION_ID
  */
 public abstract class AlarmDatabaseExtractor {
-    /** The log.*/
+    /**
+     * The log.
+     */
     private final Logger log = LoggerFactory.getLogger(getClass());
-    
-    /** Position of the component id in the extraction.*/
+
+    /**
+     * Position of the component id in the extraction.
+     */
     private static final int POSITION_COMPONENT_GUID = 1;
-    /** Position of the alarm code in the extraction.*/
+    /**
+     * Position of the alarm code in the extraction.
+     */
     private static final int POSITION_ALARM_CODE = 2;
-    /** Position of the alarm text in the extraction.*/
+    /**
+     * Position of the alarm text in the extraction.
+     */
     private static final int POSITION_ALARM_TEXT = 3;
-    /** Position of the alarm date in the extraction.*/
+    /**
+     * Position of the alarm date in the extraction.
+     */
     private static final int POSITION_ALARM_DATE = 4;
-    /** Position of the file id in the extraction.*/
+    /**
+     * Position of the file id in the extraction.
+     */
     private static final int POSITION_FILE_ID = 5;
-    /** Position of the collection id in the extraction. */
+    /**
+     * Position of the collection id in the extraction.
+     */
     private static final int POSITION_COLLECTION_ID = 6;
-    
-    /** The model containing the elements for the restriction.*/
+
+    /**
+     * The model containing the elements for the restriction.
+     */
     private final AlarmDatabaseExtractionModel model;
-    /** The connector to the database.*/
+    /**
+     * The connector to the database.
+     */
     private final DBConnector dbConnector;
-    
+
     /**
      * Constructor.
-     * @param model The model for the restriction for the extraction from the database.
+     *
+     * @param model       The model for the restriction for the extraction from the database.
      * @param dbConnector The connector to the database, where the alarms are to be extracted.
      */
     public AlarmDatabaseExtractor(AlarmDatabaseExtractionModel model, DBConnector dbConnector) {
         ArgumentValidator.checkNotNull(model, "ExtractModel model");
         ArgumentValidator.checkNotNull(dbConnector, "DBConnector dbConnector");
-        
+
         this.model = model;
         this.dbConnector = dbConnector;
     }
-    
+
     /**
      * Extracts the requested alarms.
+     *
      * @return The alarms requested through the ExtractModel.
      */
     public List<Alarm> extractAlarms() {
-        StringBuilder sqlBuilder = new StringBuilder();
-        sqlBuilder.append(createSelectString());
-        sqlBuilder.append(" FROM " + ALARM_TABLE);
-        sqlBuilder.append(createRestriction());
-        sqlBuilder.append(createOrder());
-        sqlBuilder.append(getResultNumberLimitations());
-        String sql = sqlBuilder.toString();
-        
+        String sql = createSelectString() +
+                " FROM " + ALARM_TABLE +
+                createRestriction() +
+                createOrder() +
+                getResultNumberLimitations();
+
         try (Connection conn = dbConnector.getConnection();
              PreparedStatement ps = DatabaseUtils.createPreparedStatement(conn, sql, extractArgumentsFromModel())) {
             List<Alarm> res = new ArrayList<>();
             ps.setFetchSize(100);
             try (ResultSet result = ps.executeQuery()) {
                 log.debug("Extracting sql '" + sql + "' with arguments '" + Arrays.asList(extractArgumentsFromModel()) + "'");
-                while(result.next()) {
+                while (result.next()) {
                     res.add(extractAlarm(result));
                 }
-            } 
+            }
             log.debug("Extracted the alarms: {}", res);
-            
+
             return res;
         } catch (Exception e) {
             throw new IllegalStateException("Could not retrieve the wanted data from the database.", e);
         }
     }
-    
+
     /**
      * Extracts a single Alarm from a single result set.
-     * TODO this makes several calls to be database to extract the component id. It could be reduced by joining the 
-     * tables in the database in the request.
+     * TODO this makes several calls to be database to extract the component id. It could be reduced by joining the tables in the
+     *  database in the request.
+     *
      * @param resultSet The result set to extract the Alarm from.
      * @return The extracted alarm.
-     * @throws SQLException if data could not be retrieved from the resultset
+     * @throws SQLException if data could not be retrieved from the resultSet
      */
     private Alarm extractAlarm(ResultSet resultSet) throws SQLException {
         Alarm alarm = new Alarm();
-        
-        Long componentGuid = resultSet.getLong(POSITION_COMPONENT_GUID);
+
+        long componentGuid = resultSet.getLong(POSITION_COMPONENT_GUID);
         String componentId = retrieveComponentId(componentGuid);
-        
+
         alarm.setAlarmCode(AlarmCode.fromValue(resultSet.getString(POSITION_ALARM_CODE)));
         alarm.setAlarmRaiser(componentId);
         alarm.setAlarmText(resultSet.getString(POSITION_ALARM_TEXT));
         alarm.setFileID(resultSet.getString(POSITION_FILE_ID));
         alarm.setOrigDateTime(CalendarUtils.getFromMillis(resultSet.getLong(POSITION_ALARM_DATE)));
         alarm.setCollectionID(resultSet.getString(POSITION_COLLECTION_ID));
-        
+
         return alarm;
     }
-    
+
     /**
-     * NOTE: This is where the position of the constants come into play. 
+     * NOTE: This is where the position of the constants come into play.
      * E.g. POSITION_COMPONENT_GUID = 1 refers to the first extracted element being the ALARM_COMPONENT_GUID.
+     *
      * @return Creates the SELECT string for the retrieval of the audit events.
      */
     private String createSelectString() {
-        StringBuilder res = new StringBuilder();
-        
-        res.append("SELECT ");
-        res.append(ALARM_COMPONENT_GUID + ", ");
-        res.append(ALARM_CODE + ", ");
-        res.append(ALARM_TEXT + ", ");
-        res.append(ALARM_DATE + ", ");
-        res.append(ALARM_FILE_ID + ", ");
-        res.append(ALARM_COLLECTION_ID + " ");
-        
-        return res.toString();
+        return "SELECT " +
+                ALARM_COMPONENT_GUID + ", " +
+                ALARM_CODE + ", " +
+                ALARM_TEXT + ", " +
+                ALARM_DATE + ", " +
+                ALARM_FILE_ID + ", " +
+                ALARM_COLLECTION_ID + " ";
     }
-    
+
     protected abstract String getResultNumberLimitations();
-    
+
     /**
      * Create the restriction part of the SQL statement for extracting the requested data from the database.
+     *
      * @return The restriction, or empty string if no restrictions.
      */
     private String createRestriction() {
         StringBuilder res = new StringBuilder();
-        
-        if(model.getComponentId() != null) {
+
+        if (model.getComponentId() != null) {
             nextArgument(res);
-            res.append(ALARM_COMPONENT_GUID + " = ( SELECT " + COMPONENT_GUID + " FROM " + COMPONENT_TABLE + " WHERE " 
-                    + COMPONENT_ID + " = ? )");
+            res.append(ALARM_COMPONENT_GUID + " = ( SELECT " + COMPONENT_GUID + " FROM " + COMPONENT_TABLE + " WHERE " + COMPONENT_ID +
+                    " = ? )");
         }
-        
-        if(model.getAlarmCode() != null) {
+
+        if (model.getAlarmCode() != null) {
             nextArgument(res);
             res.append(ALARM_CODE + " = ?");
         }
-        
-        if(model.getStartDate() != null) {
+
+        if (model.getStartDate() != null) {
             nextArgument(res);
             res.append(ALARM_DATE + " >= ?");
         }
-        
-        if(model.getEndDate() != null) {
+
+        if (model.getEndDate() != null) {
             nextArgument(res);
             res.append(ALARM_DATE + " <= ?");
         }
-        
-        if(model.getFileID() != null) {
+
+        if (model.getFileID() != null) {
             nextArgument(res);
             res.append(ALARM_FILE_ID + " = ?");
         }
-        
-        if(model.getCollectionID() != null) {
+
+        if (model.getCollectionID() != null) {
             nextArgument(res);
             res.append(ALARM_COLLECTION_ID + " = ?");
         }
-        
+
         return res.toString();
     }
-    
+
     /**
      * Adds either ' AND ' or 'WHERE ' depending on whether it is the first restriction.
+     *
      * @param res The StringBuilder where the restrictions are combined.
      */
     private void nextArgument(StringBuilder res) {
-        if(res.length() > 0) {
+        if (res.length() > 0) {
             res.append(" AND ");
         } else {
             res.append(" WHERE ");
-        }            
+        }
     }
-    
+
     /**
      * Extracts the elements from the model ordered by the respective position (see class definition).
+     *
      * @return The list of elements in the model which are not null.
      */
     private Object[] extractArgumentsFromModel() {
         List<Object> res = new ArrayList<>();
-        
-        if(model.getComponentId() != null) {
+
+        if (model.getComponentId() != null) {
             res.add(model.getComponentId());
         }
-        
-        if(model.getAlarmCode() != null) {
+
+        if (model.getAlarmCode() != null) {
             res.add(model.getAlarmCode().toString());
         }
-        
-        if(model.getStartDate() != null) {
+
+        if (model.getStartDate() != null) {
             res.add(model.getStartDate().getTime());
         }
-        
-        if(model.getEndDate() != null) {
+
+        if (model.getEndDate() != null) {
             res.add(model.getEndDate().getTime());
         }
-        
-        if(model.getFileID() != null) {
+
+        if (model.getFileID() != null) {
             res.add(model.getFileID());
         }
-        
-        if(model.getCollectionID() != null) {
+
+        if (model.getCollectionID() != null) {
             res.add(model.getCollectionID());
         }
-        
+
         res.add(model.getMaxCount());
-        
+
         return res.toArray();
     }
-    
+
     /**
-     * Extracts the delivery order for the results, ascending or descending. 
+     * Extracts the delivery order for the results, ascending or descending.
+     *
      * @return The part of the SQL for telling which order of date the results should be delivered.
      */
     private String createOrder() {
         StringBuilder res = new StringBuilder();
         res.append(" ORDER BY " + ALARM_DATE + " ");
-        if(model.getAscending()) {
+        if (model.getAscending()) {
             res.append("ASC");
         } else {
             res.append("DESC");
         }
-        
+
         return res.toString();
     }
-    
+
     /**
-     * Retrieves a id of a component based on the guid. 
+     * Retrieves an ID of a component based on the guid.
+     *
      * @param componentGuid The guid of the component.
      * @return The id of the component corresponding to guid.
      */
     private String retrieveComponentId(long componentGuid) {
-        String sqlRetrieve = "SELECT " + COMPONENT_ID + " FROM " + COMPONENT_TABLE 
-                + " WHERE " + COMPONENT_GUID + " = ?";
-        
+        String sqlRetrieve = "SELECT " + COMPONENT_ID + " FROM " + COMPONENT_TABLE + " WHERE " + COMPONENT_GUID + " = ?";
+
         return DatabaseUtils.selectStringValue(dbConnector, sqlRetrieve, componentGuid);
     }
 }
diff --git a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/store/AlarmDatabaseIngestor.java b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/store/AlarmDatabaseIngestor.java
index 16fc07ee8..a836c7ad9 100644
--- a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/store/AlarmDatabaseIngestor.java
+++ b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/store/AlarmDatabaseIngestor.java
@@ -5,25 +5,22 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.alarm.store;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.bitrepository.bitrepositoryelements.Alarm;
 import org.bitrepository.common.ArgumentValidator;
 import org.bitrepository.common.utils.CalendarUtils;
@@ -32,6 +29,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import static org.bitrepository.alarm.store.AlarmDatabaseConstants.ALARM_CODE;
 import static org.bitrepository.alarm.store.AlarmDatabaseConstants.ALARM_COLLECTION_ID;
 import static org.bitrepository.alarm.store.AlarmDatabaseConstants.ALARM_COMPONENT_GUID;
@@ -45,7 +45,7 @@
 
 /**
  * Handles the ingest of the Alarm messages into the database.
- * 
+ * <p>
  * Ingested in the following order:
  * ALARM_COMPONENT_GUID
  * ALARM_CODE
@@ -55,27 +55,29 @@
  * ALARM_COLLECTION_ID
  */
 public class AlarmDatabaseIngestor {
-    /** The log.*/
-    private Logger log = LoggerFactory.getLogger(getClass());
-    /** The connector to the database, where the alarms should be ingested.*/
+    private final Logger log = LoggerFactory.getLogger(getClass());
+    /**
+     * The connector to the database, where the alarms should be ingested.
+     */
     private final DBConnector dbConnector;
-    
+
     /**
      * @param dbConnector The connector to the database, where the audit trails are to be ingested.
      */
     public AlarmDatabaseIngestor(DBConnector dbConnector) {
         ArgumentValidator.checkNotNull(dbConnector, "DBConnector dbConnector");
-        
+
         this.dbConnector = dbConnector;
     }
-    
+
     /**
      * Ingest the given alarm into the database.
+     *
      * @param alarm The alarm to the ingested into the alarm database.
      */
     public void ingestAlarm(Alarm alarm) {
         ArgumentValidator.checkNotNull(alarm, "Alarm alarm");
-        
+
         String sqlInsert = "INSERT INTO " + ALARM_TABLE + " ( " + createIngestElementString(alarm) + " )"
                 + " VALUES ( " + createIngestArgumentString(alarm) + " )";
         DatabaseUtils.executeStatement(dbConnector, sqlInsert, extractArgumentsFromEvent(alarm));
@@ -87,72 +89,74 @@ public void ingestAlarm(Alarm alarm) {
      */
     private String createIngestElementString(Alarm alarm) {
         StringBuilder res = new StringBuilder();
-        
+
         addElement(res, alarm.getAlarmRaiser(), ALARM_COMPONENT_GUID);
         addElement(res, alarm.getAlarmCode(), ALARM_CODE);
         addElement(res, alarm.getAlarmText(), ALARM_TEXT);
         addElement(res, alarm.getOrigDateTime(), ALARM_DATE);
         addElement(res, alarm.getFileID(), ALARM_FILE_ID);
         addElement(res, alarm.getCollectionID(), ALARM_COLLECTION_ID);
-        
+
         return res.toString();
     }
-    
+
     /**
      * Adds the field for a given element to the string builder if the element is not null.
-     * @param res The StringBuilder where the restrictions are combined.
+     *
+     * @param res     The StringBuilder where the restrictions are combined.
      * @param element The element to be ingested. Is validated whether it is null.
-     * @param name The name of the field in the database corresponding to the element. 
+     * @param name    The name of the field in the database corresponding to the element.
      */
     private void addElement(StringBuilder res, Object element, String name) {
-        if(element == null) {
+        if (element == null) {
             return;
         }
-        
-        if(res.length() == 0) {
+
+        if (res.length() == 0) {
             res.append(" ");
         } else {
             res.append(" , ");
         }
-        
+
         res.append(name);
     }
-    
+
     /**
      * @param alarm The alarm to ingest into the database.
      * @return The string for the arguments for the elements of the event to be ingested into the database.
      */
     private String createIngestArgumentString(Alarm alarm) {
         StringBuilder res = new StringBuilder();
-        
+
         addArgument(res, alarm.getAlarmRaiser());
         addArgument(res, alarm.getAlarmCode());
         addArgument(res, alarm.getAlarmText());
         addArgument(res, alarm.getOrigDateTime());
         addArgument(res, alarm.getFileID());
         addArgument(res, alarm.getCollectionID());
-        
+
         return res.toString();
     }
-    
+
     /**
      * Adds a question mark for a given element to the string builder if the element is not null.
-     * @param res The StringBuilder where the restrictions are combined.
+     *
+     * @param res     The StringBuilder where the restrictions are combined.
      * @param element The element to be ingested. Is validated whether it is null.
      */
     private void addArgument(StringBuilder res, Object element) {
-        if(element == null) {
+        if (element == null) {
             return;
         }
-        
-        if(res.length() == 0) {
+
+        if (res.length() == 0) {
             res.append(" ? ");
         } else {
             res.append(", ? ");
         }
     }
 
-    
+
     /**
      * @param alarm the alarm
      * @return The list of elements in the model which are not null.
@@ -160,55 +164,56 @@ private void addArgument(StringBuilder res, Object element) {
     private Object[] extractArgumentsFromEvent(Alarm alarm) {
         List<Object> res = new ArrayList<>();
 
-        if(alarm.getAlarmRaiser() != null) {
+        if (alarm.getAlarmRaiser() != null) {
             Long componentGuid = retrieveComponentGuid(alarm.getAlarmRaiser());
             res.add(componentGuid);
         }
-        
-        if(alarm.getAlarmCode() != null) {
+
+        if (alarm.getAlarmCode() != null) {
             res.add(alarm.getAlarmCode().toString());
         }
-        
-        if(alarm.getAlarmText() != null) {
+
+        if (alarm.getAlarmText() != null) {
             res.add(alarm.getAlarmText());
         }
-        
-        if(alarm.getOrigDateTime() != null) {
+
+        if (alarm.getOrigDateTime() != null) {
             res.add(CalendarUtils.convertFromXMLGregorianCalendar(alarm.getOrigDateTime()).getTime());
         }
-        
-        if(alarm.getFileID() != null) {
+
+        if (alarm.getFileID() != null) {
             res.add(alarm.getFileID());
         }
-        
-        if(alarm.getCollectionID() != null) {
+
+        if (alarm.getCollectionID() != null) {
             res.add(alarm.getCollectionID());
         }
-        
+
         return res.toArray();
     }
-    
+
     /**
-     * Retrieve the guid for a given component. If the component does not exist within the component table, 
+     * Retrieve the guid for a given component. If the component does not exist within the component table,
      * then it is created.
-     * 
+     *
      * @param componentId The name of the alarm producing component.
      * @return The guid of the component with the given name.
      */
     private synchronized long retrieveComponentGuid(String componentId) {
-        String sqlRetrieve = "SELECT " + COMPONENT_GUID + " FROM " + COMPONENT_TABLE 
+        String sqlRetrieve = "SELECT " + COMPONENT_GUID + " FROM " + COMPONENT_TABLE
                 + " WHERE " + COMPONENT_ID + " = ?";
-        
+
         Long guid = DatabaseUtils.selectLongValue(dbConnector, sqlRetrieve, componentId);
-        
-        if(guid == null) {
+
+        if (guid == null) {
             log.debug("Inserting component '" + componentId + "' into the component table.");
             String sqlInsert = "INSERT INTO " + COMPONENT_TABLE + " ( " + COMPONENT_ID + " ) VALUES ( ? )";
             DatabaseUtils.executeStatement(dbConnector, sqlInsert, componentId);
-            
+
             guid = DatabaseUtils.selectLongValue(dbConnector, sqlRetrieve, componentId);
         }
-        
+
+        assert guid != null;
         return guid;
     }
 }
diff --git a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/store/AlarmDatabaseManager.java b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/store/AlarmDatabaseManager.java
index f1dfb0605..ddc04de82 100644
--- a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/store/AlarmDatabaseManager.java
+++ b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/store/AlarmDatabaseManager.java
@@ -8,12 +8,12 @@
  * it under the terms of the GNU Lesser General Public License as
  * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
@@ -33,11 +33,11 @@ public class AlarmDatabaseManager extends DatabaseManager {
     public final static String ALARM_SERVICE_DATABASE_SCHEMA = "sql/derby/alarmServiceDBCreation.sql";
     private final DatabaseSpecifics databaseSpecifics;
     private DatabaseMigrator migrator = null;
-    
+
     public AlarmDatabaseManager(DatabaseSpecifics databaseSpecifics) {
         this.databaseSpecifics = databaseSpecifics;
     }
-    
+
     @Override
     protected DatabaseSpecifics getDatabaseSpecifics() {
         return databaseSpecifics;
@@ -45,7 +45,7 @@ protected DatabaseSpecifics getDatabaseSpecifics() {
 
     @Override
     protected DatabaseMigrator getMigrator() {
-        if(migrator == null) {
+        if (migrator == null) {
             migrator = new AlarmDatabaseMigrator(connector);
         }
         return migrator;
diff --git a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/store/AlarmDatabaseMigrator.java b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/store/AlarmDatabaseMigrator.java
index 54e2037cc..bd16f46e0 100644
--- a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/store/AlarmDatabaseMigrator.java
+++ b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/store/AlarmDatabaseMigrator.java
@@ -5,76 +5,81 @@
  * Copyright (C) 2010 - 2013 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.alarm.store;
 
-import static org.bitrepository.alarm.store.AlarmDatabaseConstants.ALARM_TABLE_VERSION_ENTRY;
-import static org.bitrepository.alarm.store.AlarmDatabaseConstants.ALARM_DATABASE_VERSION_ENTRY;
-
-import java.util.Map;
-
 import org.bitrepository.service.database.DBConnector;
 import org.bitrepository.service.database.DatabaseMigrator;
 import org.bitrepository.service.database.DatabaseUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Map;
+
+import static org.bitrepository.alarm.store.AlarmDatabaseConstants.ALARM_DATABASE_VERSION_ENTRY;
+import static org.bitrepository.alarm.store.AlarmDatabaseConstants.ALARM_TABLE_VERSION_ENTRY;
+
 /**
  * Migration class for the AlarmServiceDatabase for the alarm service.
  * Will only try to perform the migration on an embedded derby database.
  */
 public class AlarmDatabaseMigrator extends DatabaseMigrator {
-    /** The log.*/
+    /**
+     * The log.
+     */
     private static final Logger log = LoggerFactory.getLogger(DatabaseUtils.class);
-    
-    /** The name of the script for updating the database from version 1 to 2.*/
+
+    /**
+     * The name of the script for updating the database from version 1 to 2.
+     */
     private static final String UPDATE_SCRIPT_VERSION_1_TO_2 = "sql/derby/alarmServiceDB1to2migration.sql";
     private static final String UPDATE_SCRIPT_VERSION_2_TO_3 = "sql/derby/alarmServiceDB2to3migration.sql";
     private static final String UPDATE_SCRIPT_VERSION_3_TO_4 = "sql/derby/alarmServiceDB3to4migration.sql";
-    /** The current version of the database. */
-    private final Integer currentVersion = 4;
-    
+
+    private final Integer currentDatabaseVersion = 4;
+
     /**
      * Constructor.
+     *
      * @param connector connection to the database.
      */
     public AlarmDatabaseMigrator(DBConnector connector) {
         super(connector);
     }
-    
+
     @Override
     public void migrate() {
         Map<String, Integer> versions = getTableVersions();
-        
-        if(!versions.containsKey(ALARM_TABLE_VERSION_ENTRY)) {
-            throw new IllegalStateException("The database does not contain '" + ALARM_TABLE_VERSION_ENTRY 
+
+        if (!versions.containsKey(ALARM_TABLE_VERSION_ENTRY)) {
+            throw new IllegalStateException("The database does not contain '" + ALARM_TABLE_VERSION_ENTRY
                     + "' table as required.");
         }
-        if(versions.get(ALARM_TABLE_VERSION_ENTRY) == 1) {
+        if (versions.get(ALARM_TABLE_VERSION_ENTRY) == 1) {
             log.warn("Migrating AlarmServiceDB from version 1 to 2.");
             migrateDerbyDatabase(UPDATE_SCRIPT_VERSION_1_TO_2);
             versions = getTableVersions();
         }
-        
-        if(!versions.containsKey(ALARM_DATABASE_VERSION_ENTRY) || versions.get(ALARM_DATABASE_VERSION_ENTRY) == 2) {
+
+        if (!versions.containsKey(ALARM_DATABASE_VERSION_ENTRY) || versions.get(ALARM_DATABASE_VERSION_ENTRY) == 2) {
             log.warn("Migrating AlarmServiceDB from version 2 to 3.");
             migrateDerbyDatabase(UPDATE_SCRIPT_VERSION_2_TO_3);
         }
-        
-        if(versions.get(ALARM_DATABASE_VERSION_ENTRY) < 4) {
+
+        if (versions.get(ALARM_DATABASE_VERSION_ENTRY) < 4) {
             log.warn("Migrating AlarmServiceDB from version 3 to 4.");
             migrateDerbyDatabase(UPDATE_SCRIPT_VERSION_3_TO_4);
         }
@@ -83,14 +88,10 @@ public void migrate() {
     @Override
     public boolean needsMigration() {
         Map<String, Integer> versions = getTableVersions();
-        
-        if(!versions.containsKey(ALARM_TABLE_VERSION_ENTRY)) {
-            throw new IllegalStateException("The database does not contain '" + ALARM_TABLE_VERSION_ENTRY 
-                    + "' table entry as required.");            
-        } else if(versions.get(ALARM_TABLE_VERSION_ENTRY) < currentVersion) {
-            return true;
-        } else {
-            return false;
-        }
+
+        if (!versions.containsKey(ALARM_TABLE_VERSION_ENTRY)) {
+            throw new IllegalStateException("The database does not contain '" + ALARM_TABLE_VERSION_ENTRY
+                    + "' table entry as required.");
+        } else return versions.get(ALARM_TABLE_VERSION_ENTRY) < currentDatabaseVersion;
     }
 }
diff --git a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/store/AlarmServiceDAO.java b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/store/AlarmServiceDAO.java
index ae0f1f1d6..caf1cad01 100644
--- a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/store/AlarmServiceDAO.java
+++ b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/store/AlarmServiceDAO.java
@@ -5,54 +5,57 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.alarm.store;
 
-import java.util.Date;
-import java.util.List;
-
 import org.bitrepository.bitrepositoryelements.Alarm;
 import org.bitrepository.bitrepositoryelements.AlarmCode;
 import org.bitrepository.service.database.DBConnector;
 import org.bitrepository.service.database.DatabaseManager;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * The interface to the database for storing the Alarms.
  */
 public abstract class AlarmServiceDAO implements AlarmStore {
-    /** The connector to the database.*/
+    /**
+     * The connector to the database.
+     */
     protected DBConnector dbConnector;
-    
-    /** 
+
+    /**
      * Constructor.
+     *
      * @param databaseManager the database manager
      */
     public AlarmServiceDAO(DatabaseManager databaseManager) {
         dbConnector = databaseManager.getConnector();
     }
-    
+
     @Override
     public void addAlarm(Alarm alarm) {
         AlarmDatabaseIngestor ingestor = new AlarmDatabaseIngestor(dbConnector);
         ingestor.ingestAlarm(alarm);
     }
-    
+
     @Override
     public abstract List<Alarm> extractAlarms(String componentID, AlarmCode alarmCode, Date minDate, Date maxDate,
-            String fileID, String collectionID, Integer count, boolean ascending); 
+                                              String fileID, String collectionID, Integer count, boolean ascending);
 
     @Override
     public void start() {
diff --git a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/store/AlarmStore.java b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/store/AlarmStore.java
index 7902486d7..f7f81a99a 100644
--- a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/store/AlarmStore.java
+++ b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/store/AlarmStore.java
@@ -1,58 +1,60 @@
 /*
  * #%L
  * Bitrepository Alarm Service
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.alarm.store;
 
-import java.util.Collection;
-import java.util.Date;
-
 import org.bitrepository.bitrepositoryelements.Alarm;
 import org.bitrepository.bitrepositoryelements.AlarmCode;
 import org.bitrepository.service.LifeCycledService;
 
+import java.util.Collection;
+import java.util.Date;
+
 /**
  * The AlarmStore is where the alarms are persisted.
  */
-public interface AlarmStore extends LifeCycledService{
+public interface AlarmStore extends LifeCycledService {
     /**
      * Add an alarm to the store.
+     *
      * @param alarm The alarm to be added to the store.
      */
     void addAlarm(Alarm alarm);
-    
+
     /**
-     * Extracts the alarms based on the given optional restictions.
-     * @param componentID [OPTIONAL] The id of the component.
-     * @param alarmCode [OPTIONAL] The alarm code.
-     * @param minDate [OPTIONAL] The earliest date for the alarms.
-     * @param maxDate [OPTIONAL] The latest date for the alarms.
-     * @param fileID [OPTIONAL] The id of the file, which the alarms are connected.
+     * Extracts the alarms based on the given optional restrictions.
+     *
+     * @param componentID  [OPTIONAL] The id of the component.
+     * @param alarmCode    [OPTIONAL] The alarm code.
+     * @param minDate      [OPTIONAL] The earliest date for the alarms.
+     * @param maxDate      [OPTIONAL] The latest date for the alarms.
+     * @param fileID       [OPTIONAL] The id of the file, which the alarms are connected.
      * @param collectionID the ID of the collection. Perhaps it is optional
-     * @param count [OPTIONAL] The maximum number of alarms to retrieve from the store.
-     * @param ascending Whether the alarms should be delivered ascending.
+     * @param count        [OPTIONAL] The maximum number of alarms to retrieve from the store.
+     * @param ascending    Whether the alarms should be delivered ascending.
      * @return The requested collection of alarms from the store.
      */
-    Collection<Alarm> extractAlarms(String componentID, AlarmCode alarmCode, Date minDate, Date maxDate, 
-            String fileID, String collectionID, Integer count, boolean ascending);
+    Collection<Alarm> extractAlarms(String componentID, AlarmCode alarmCode, Date minDate, Date maxDate,
+                                    String fileID, String collectionID, Integer count, boolean ascending);
 }
diff --git a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/store/DerbyAlarmDatabaseExtractor.java b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/store/DerbyAlarmDatabaseExtractor.java
index f2306c091..0e2e49a00 100644
--- a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/store/DerbyAlarmDatabaseExtractor.java
+++ b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/store/DerbyAlarmDatabaseExtractor.java
@@ -8,12 +8,12 @@
  * it under the terms of the GNU Lesser General Public License as
  * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
@@ -33,5 +33,5 @@ public DerbyAlarmDatabaseExtractor(AlarmDatabaseExtractionModel model, DBConnect
     protected String getResultNumberLimitations() {
         return " FETCH FIRST ? ROWS ONLY";
     }
-    
+
 }
diff --git a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/store/DerbyAlarmServiceDAO.java b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/store/DerbyAlarmServiceDAO.java
index 63fa6a134..30d3c30bc 100644
--- a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/store/DerbyAlarmServiceDAO.java
+++ b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/store/DerbyAlarmServiceDAO.java
@@ -8,12 +8,12 @@
  * it under the terms of the GNU Lesser General Public License as
  * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
@@ -21,13 +21,13 @@
  */
 package org.bitrepository.alarm.store;
 
-import java.util.Date;
-import java.util.List;
-
 import org.bitrepository.bitrepositoryelements.Alarm;
 import org.bitrepository.bitrepositoryelements.AlarmCode;
 import org.bitrepository.service.database.DatabaseManager;
 
+import java.util.Date;
+import java.util.List;
+
 public class DerbyAlarmServiceDAO extends AlarmServiceDAO {
 
     public DerbyAlarmServiceDAO(DatabaseManager databaseManager) {
@@ -35,9 +35,9 @@ public DerbyAlarmServiceDAO(DatabaseManager databaseManager) {
     }
 
     @Override
-    public List<Alarm> extractAlarms(String componentID, AlarmCode alarmCode, Date minDate, Date maxDate, 
-            String fileID, String collectionID, Integer count, boolean ascending)  {
-        AlarmDatabaseExtractionModel extractModel = new AlarmDatabaseExtractionModel(collectionID, componentID, alarmCode, 
+    public List<Alarm> extractAlarms(String componentID, AlarmCode alarmCode, Date minDate, Date maxDate,
+                                     String fileID, String collectionID, Integer count, boolean ascending) {
+        AlarmDatabaseExtractionModel extractModel = new AlarmDatabaseExtractionModel(collectionID, componentID, alarmCode,
                 minDate, maxDate, fileID, count, ascending);
 
         AlarmDatabaseExtractor extractor = new DerbyAlarmDatabaseExtractor(extractModel, dbConnector);
diff --git a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/store/PostgresAlarmDatabaseExtractor.java b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/store/PostgresAlarmDatabaseExtractor.java
index 21fe01daa..45ee85b8b 100644
--- a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/store/PostgresAlarmDatabaseExtractor.java
+++ b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/store/PostgresAlarmDatabaseExtractor.java
@@ -8,12 +8,12 @@
  * it under the terms of the GNU Lesser General Public License as
  * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
@@ -33,5 +33,5 @@ public PostgresAlarmDatabaseExtractor(AlarmDatabaseExtractionModel model, DBConn
     protected String getResultNumberLimitations() {
         return " LIMIT ?";
     }
-    
+
 }
diff --git a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/store/PostgresAlarmServiceDAO.java b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/store/PostgresAlarmServiceDAO.java
index f0ffab28b..f0dbe2f33 100644
--- a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/store/PostgresAlarmServiceDAO.java
+++ b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/store/PostgresAlarmServiceDAO.java
@@ -8,12 +8,12 @@
  * it under the terms of the GNU Lesser General Public License as
  * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
@@ -21,13 +21,13 @@
  */
 package org.bitrepository.alarm.store;
 
-import java.util.Date;
-import java.util.List;
-
 import org.bitrepository.bitrepositoryelements.Alarm;
 import org.bitrepository.bitrepositoryelements.AlarmCode;
 import org.bitrepository.service.database.DatabaseManager;
 
+import java.util.Date;
+import java.util.List;
+
 public class PostgresAlarmServiceDAO extends AlarmServiceDAO {
 
     public PostgresAlarmServiceDAO(DatabaseManager databaseManager) {
@@ -35,9 +35,9 @@ public PostgresAlarmServiceDAO(DatabaseManager databaseManager) {
     }
 
     @Override
-    public List<Alarm> extractAlarms(String componentID, AlarmCode alarmCode, Date minDate, Date maxDate, 
-            String fileID, String collectionID, Integer count, boolean ascending)  {
-        AlarmDatabaseExtractionModel extractModel = new AlarmDatabaseExtractionModel(collectionID, componentID, alarmCode, 
+    public List<Alarm> extractAlarms(String componentID, AlarmCode alarmCode, Date minDate, Date maxDate,
+                                     String fileID, String collectionID, Integer count, boolean ascending) {
+        AlarmDatabaseExtractionModel extractModel = new AlarmDatabaseExtractionModel(collectionID, componentID, alarmCode,
                 minDate, maxDate, fileID, count, ascending);
 
         AlarmDatabaseExtractor extractor = new PostgresAlarmDatabaseExtractor(extractModel, dbConnector);
diff --git a/bitrepository-audit-trail-service/src/main/assembly/assembly.xml b/bitrepository-audit-trail-service/src/main/assembly/assembly.xml
index 908f02075..bd845407d 100644
--- a/bitrepository-audit-trail-service/src/main/assembly/assembly.xml
+++ b/bitrepository-audit-trail-service/src/main/assembly/assembly.xml
@@ -1,6 +1,6 @@
 <!--
   #%L
-  Bitrepository Reference Pillar
+  BitRepository Reference Pillar
   
   $Id$
   $HeadURL$
diff --git a/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/AuditTrailService.java b/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/AuditTrailService.java
index 9ca23bc99..a4878e94e 100644
--- a/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/AuditTrailService.java
+++ b/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/AuditTrailService.java
@@ -1,70 +1,64 @@
 /*
  * #%L
  * Bitrepository Audit Trail Service
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.audittrails;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import javax.jms.JMSException;
-
 import org.bitrepository.audittrails.collector.AuditTrailCollector;
+import org.bitrepository.audittrails.store.AuditEventIterator;
 import org.bitrepository.audittrails.store.AuditTrailStore;
+import org.bitrepository.audittrails.webservice.CollectorInfo;
 import org.bitrepository.bitrepositoryelements.FileAction;
 import org.bitrepository.common.ArgumentValidator;
 import org.bitrepository.common.settings.Settings;
 import org.bitrepository.protocol.messagebus.MessageBus;
 import org.bitrepository.protocol.messagebus.MessageBusManager;
 import org.bitrepository.service.LifeCycledService;
-import org.bitrepository.audittrails.webservice.CollectorInfo;
 import org.bitrepository.service.contributor.ContributorMediator;
-import org.bitrepository.audittrails.store.AuditEventIterator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.jms.JMSException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
 /**
- * Class to expose the functionality of the AuditTrailService. 
- * Aggregates the needed classes.   
+ * Class to expose the functionality of the AuditTrailService.
+ * Aggregates the needed classes.
  */
 public class AuditTrailService implements LifeCycledService {
     private final Logger log = LoggerFactory.getLogger(getClass());
-    /** The storage of audit trail information.*/
     private final AuditTrailStore store;
-    /** The collector of new audit trails.*/
     private final AuditTrailCollector collector;
-    /** The mediator for handling the messages.*/
     private final ContributorMediator mediator;
-    /** The settings.*/
     private final Settings settings;
 
     /**
-     * Constructor.
-     * @param store The store for the audit trail data.
+     * @param store     The store for the audit trail data.
      * @param collector The collector of new audit trail data.
-     * @param mediator The mediator for the communication of this contributor.
-     * @param settings The AuditTrailService settings.
+     * @param mediator  The mediator for the communication of this contributor.
+     * @param settings  The AuditTrailService settings.
      */
     public AuditTrailService(
             AuditTrailStore store,
@@ -83,25 +77,27 @@ public AuditTrailService(
 
         mediator.start();
     }
-    
+
     /**
      * Retrieve an iterator to all AuditTrailEvents matching the criteria from the parameters.
      * All parameters are allowed to be null, meaning that the parameter imposes no restriction on the result
-     * @param fromDate Restrict the results to only provide events after this point in time
-     * @param toDate Restrict the results to only provide events up till this point in time
-     * @param fileID Restrict the results to only be about this fileID
-     * @param collectionID restrict the results to this collection
+     *
+     * @param fromDate           Restrict the results to only provide events after this point in time
+     * @param toDate             Restrict the results to only provide events up till this point in time
+     * @param fileID             Restrict the results to only be about this fileID
+     * @param collectionID       restrict the results to this collection
      * @param reportingComponent Restrict the results to only be reported by this component
-     * @param actor Restrict the results to only be events caused by this actor
-     * @param action Restrict the results to only be about this type of action
-     * @param fingerprint the fingerprint
-     * @param operationID Restrict the results to only this operationID
+     * @param actor              Restrict the results to only be events caused by this actor
+     * @param action             Restrict the results to only be about this type of action
+     * @param fingerprint        the fingerprint
+     * @param operationID        Restrict the results to only this operationID
      * @return an iterator to all AuditTrailEvents matching the criteria from the parameters
      */
-    public AuditEventIterator queryAuditTrailEventsByIterator(Date fromDate, Date toDate, String fileID, 
-            String collectionID, String reportingComponent, String actor, FileAction action, 
-            String fingerprint, String operationID) {
-        return store.getAuditTrailsByIterator(fileID, collectionID, reportingComponent, null, null, actor, action, 
+    public AuditEventIterator queryAuditTrailEventsByIterator(Date fromDate, Date toDate, String fileID,
+                                                              String collectionID, String reportingComponent, String actor,
+                                                              FileAction action,
+                                                              String fingerprint, String operationID) {
+        return store.getAuditTrailsByIterator(fileID, collectionID, reportingComponent, null, null, actor, action,
                 fromDate, toDate, fingerprint, operationID);
     }
 
@@ -111,29 +107,31 @@ public AuditEventIterator queryAuditTrailEventsByIterator(Date fromDate, Date to
      * as argument.
      */
     public void collectAuditTrails() {
-        for(org.bitrepository.settings.repositorysettings.Collection c 
+        for (org.bitrepository.settings.repositorysettings.Collection c
                 : settings.getRepositorySettings().getCollections().getCollection()) {
             collector.collectNewestAudits(c.getID());
         }
     }
-    
+
     /**
-     * Get the list of {@link CollectorInfo} 
+     * Get the list of {@link CollectorInfo}
+     *
      * @return The list of CollectorInfo
      */
     public List<CollectorInfo> getCollectorInfos() {
         List<CollectorInfo> infos = new ArrayList<>();
-        for(org.bitrepository.settings.repositorysettings.Collection c 
+        for (org.bitrepository.settings.repositorysettings.Collection c
                 : settings.getRepositorySettings().getCollections().getCollection()) {
             infos.add(collector.getCollectorInfo(c.getID()));
         }
-        
+
         return infos;
     }
-    
+
     /**
-     *  Get the list of known contributors from the backend. 
-     *  @return The list of known contributors 
+     * Get the list of known contributors from the backend.
+     *
+     * @return The list of known contributors
      */
     public List<String> getContributors() {
         return store.getKnownContributors();
@@ -150,7 +148,7 @@ public void shutdown() {
         store.close();
         mediator.close();
         MessageBus messageBus = MessageBusManager.getMessageBus();
-        if ( messageBus != null) {
+        if (messageBus != null) {
             try {
                 messageBus.close();
             } catch (JMSException e) {
diff --git a/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/AuditTrailServiceFactory.java b/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/AuditTrailServiceFactory.java
index e763ced92..fe9ad3db8 100644
--- a/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/AuditTrailServiceFactory.java
+++ b/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/AuditTrailServiceFactory.java
@@ -1,38 +1,29 @@
 /*
  * #%L
  * Bitrepository Audit Trail Service
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.audittrails;
 
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Paths;
-import java.util.Properties;
-
 import org.bitrepository.access.AccessComponentFactory;
 import org.bitrepository.access.getaudittrails.AuditTrailClient;
 import org.bitrepository.audittrails.collector.AuditTrailCollector;
@@ -60,69 +51,70 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Paths;
+import java.util.Properties;
+
 /**
- * Factory class for accessing the AuditTrailService 
+ * Factory class for accessing the AuditTrailService
  */
 public final class AuditTrailServiceFactory {
-
     private static final Logger log = LoggerFactory.getLogger(AuditTrailServiceFactory.class);
-    /** The audit trail service. 
-     * @see #getAuditTrailService().*/
     private static AuditTrailService auditTrailService;
-    /** The path to the directory containing the configuration files.*/
     private static String configurationDir;
-    /** The path to the private key file.*/
-    private static String privateKeyFile;
-    
-    /** The properties file holding implementation specifics for the alarm service. */
-    private static final String CONFIGFILE = "audittrails.properties";
-    /** Property key to tell where to locate the path and filename to the private key file. */
+    private static String privateKeyFilePath;
+    private static final String CONFIG_FILE = "audittrails.properties";
     private static final String PRIVATE_KEY_FILE = "org.bitrepository.audit-trail-service.privateKeyFile";
-       
     private static AlarmDispatcher alarmDispatcher;
     private static Settings settings;
     private static SecurityManager securityManager;
-    private static MessageBus messageBus;
-    
+
     /**
      * Private constructor as the class is meant to be used in a static way.
      */
-    private AuditTrailServiceFactory() { }
-    
+    private AuditTrailServiceFactory() {}
+
     /**
-     * Initialize the factory with configuration. 
+     * Initialize the factory with configuration.
+     *
      * @param confDir String containing the path to the AuditTrailService's configuration directory
      */
     public static synchronized void init(String confDir) {
         configurationDir = confDir;
         loadSettings();
-        securityManager = SecurityManagerUtil.getSecurityManager(settings, Paths.get(privateKeyFile),
+        securityManager = SecurityManagerUtil.getSecurityManager(settings, Paths.get(privateKeyFilePath),
                 settings.getReferenceSettings().getAuditTrailServiceSettings().getID());
-        messageBus = ProtocolComponentFactory.getInstance().getMessageBus(settings, securityManager);
+        MessageBus messageBus = ProtocolComponentFactory.getInstance().getMessageBus(settings, securityManager);
         alarmDispatcher = new AlarmDispatcher(settings, messageBus);
     }
-    
+
     /**
-     * Factory method to retrieve AuditTrailService  
+     * Factory method to retrieve AuditTrailService
+     *
      * @return The AuditTrailService.
      */
     public static synchronized AuditTrailService getAuditTrailService() {
-        if(auditTrailService == null) {
+        if (auditTrailService == null) {
             ContributorMediator mediator = new SimpleContributorMediator(
-                    ProtocolComponentFactory.getInstance().getMessageBus(settings, securityManager), 
+                    ProtocolComponentFactory.getInstance().getMessageBus(settings, securityManager),
                     settings, null, ProtocolComponentFactory.getInstance().getFileExchange(settings));
-            
-            PutFileClient putClient = ModifyComponentFactory.getInstance().retrievePutClient(settings, 
+
+            PutFileClient putClient = ModifyComponentFactory.getInstance().retrievePutClient(settings,
                     securityManager, "audit-trail-preserver");
-            
+
             AuditTrailServiceSettings serviceSettings = settings.getReferenceSettings().getAuditTrailServiceSettings();
-            
+
             DatabaseManager auditTrailServiceDatabaseManager = new AuditTrailDatabaseManager(
                     serviceSettings.getAuditTrailServiceDatabase());
             AuditTrailStore store = new AuditTrailServiceDAO(auditTrailServiceDatabaseManager);
-            AuditTrailClient client = AccessComponentFactory.getInstance().createAuditTrailClient(settings, 
+            AuditTrailClient client = AccessComponentFactory.getInstance().createAuditTrailClient(settings,
                     securityManager, serviceSettings.getID());
-            
+
             AuditTrailCollector collector = new AuditTrailCollector(settings, client, store, alarmDispatcher);
             AuditTrailPreserver preserver;
             if (serviceSettings.isSetAuditTrailPreservation()) {
@@ -132,38 +124,39 @@ public static synchronized AuditTrailService getAuditTrailService() {
             } else {
                 log.info("Audit trail preservation disabled, no configuration defined.");
             }
-            
+
             auditTrailService = new AuditTrailService(store, collector, mediator, settings);
         }
-        
+
         return auditTrailService;
     }
-    
+
     /**
      * Retrieves the shared settings based on the directory specified in the {@link #init(String)} method.
      */
     private static void loadSettings() {
-        if(configurationDir == null) {
+        if (configurationDir == null) {
             throw new IllegalStateException("No configuration directory has been set!");
         }
         loadProperties();
         ServiceSettingsProvider settingsLoader =
                 new ServiceSettingsProvider(new XMLFileSettingsLoader(configurationDir), ServiceType.AUDIT_TRAIL_SERVICE);
         settings = settingsLoader.getSettings();
-        SettingsUtils.initialize(settings);        
+        SettingsUtils.initialize(settings);
     }
-    
+
     /**
      * Loads the properties.
+     *
      * @throws IllegalStateException If any input/output issues occurs.
      */
     private static void loadProperties() {
         Properties properties = new Properties();
-        File propertiesFile = new File(configurationDir, CONFIGFILE);
+        File propertiesFile = new File(configurationDir, CONFIG_FILE);
         try (BufferedReader propertiesReader = new BufferedReader(
                 new InputStreamReader(new FileInputStream(propertiesFile), StandardCharsets.UTF_8))) {
             properties.load(propertiesReader);
-            privateKeyFile = properties.getProperty(PRIVATE_KEY_FILE);
+            privateKeyFilePath = properties.getProperty(PRIVATE_KEY_FILE);
         } catch (IOException e) {
             throw new IllegalStateException("Could not instantiate the properties.", e);
         }
diff --git a/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/collector/AuditTrailCollectionTimerTask.java b/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/collector/AuditTrailCollectionTimerTask.java
index af25d1054..0d8494a7f 100644
--- a/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/collector/AuditTrailCollectionTimerTask.java
+++ b/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/collector/AuditTrailCollectionTimerTask.java
@@ -8,12 +8,12 @@
  * it under the terms of the GNU Lesser General Public License as
  * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
@@ -21,23 +21,22 @@
  */
 package org.bitrepository.audittrails.collector;
 
-import java.util.Date;
-import java.util.TimerTask;
-
 import org.bitrepository.common.utils.SettingsUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Date;
+import java.util.TimerTask;
+
 public class AuditTrailCollectionTimerTask extends TimerTask {
-    private Logger log = LoggerFactory.getLogger(getClass());
+    private final Logger log = LoggerFactory.getLogger(getClass());
 
     private final IncrementalCollector collector;
-    /** The collection schedule */
     private final CollectionSchedule schedule;
-    
+
     /**
-     * @param collector The collector doing the actual work.
-     * @param interval The interval between running this timer task.
+     * @param collector   The collector doing the actual work.
+     * @param interval    The interval between running this timer task.
      * @param gracePeriod The period that should pass before the first scheduled collection
      */
     public AuditTrailCollectionTimerTask(IncrementalCollector collector, long interval, int gracePeriod) {
@@ -45,32 +44,23 @@ public AuditTrailCollectionTimerTask(IncrementalCollector collector, long interv
         this.collector = collector;
         log.info("Scheduled next collection of audit trails for {}", schedule.getNextRun());
     }
-    
-    /**
-     * @return the next scheduled collection
-     */
+
     public Date getNextScheduledRun() {
         return schedule.getNextRun();
     }
-    
-    /**
-     * @return the date of the last started collection
-     */
+
     public Date getLastCollectionStart() {
         return schedule.getLastStart();
     }
-    
-    /**
-     * @return  the date of the last finished collection
-     */
+
     public Date getLastCollectionFinish() {
         return schedule.getLastFinish();
     }
-    
+
     public long getLastNumberOfCollectedAudits() {
         return collector.getNumberOfCollectedAudits();
     }
-    
+
     /**
      * Run the operation and when finished set the date for the next collection.
      */
@@ -84,7 +74,7 @@ public synchronized void runCollection() {
 
     @Override
     public void run() {
-        if(schedule.getNextRun().getTime() < System.currentTimeMillis()) {
+        if (schedule.getNextRun().getTime() < System.currentTimeMillis()) {
             runCollection();
         }
     }
diff --git a/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/collector/AuditTrailCollector.java b/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/collector/AuditTrailCollector.java
index 8c8901bb7..76dc694e9 100644
--- a/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/collector/AuditTrailCollector.java
+++ b/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/collector/AuditTrailCollector.java
@@ -1,34 +1,29 @@
 /*
  * #%L
  * Bitrepository Audit Trail Service
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.audittrails.collector;
 
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Timer;
-
 import org.bitrepository.access.getaudittrails.AuditTrailClient;
 import org.bitrepository.audittrails.store.AuditTrailStore;
 import org.bitrepository.audittrails.webservice.CollectorInfo;
@@ -41,29 +36,32 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Timer;
+
 /**
- * Manages the retrieval of of AuditTrails from contributors.
+ * Manages the retrieval of AuditTrails from contributors.
  */
 public class AuditTrailCollector {
-    private Logger log = LoggerFactory.getLogger(getClass());
-    /** The task for collecting the audits.*/
-    private final Map<String, AuditTrailCollectionTimerTask> collectorTasks = new HashMap<String, 
-            AuditTrailCollectionTimerTask>();
-    /** The timer for keeping track of the collecting task.*/
-    private Timer timer;
+    private final Logger log = LoggerFactory.getLogger(getClass());
+    private final Map<String, AuditTrailCollectionTimerTask> collectorTasks = new HashMap<>();
+    private final Timer timer;
     private final Settings settings;
-
-    /** Initial grace period in milliseconds after startup to allow the system to finish startup. */
+    /**
+     * Initial grace period in milliseconds after startup to allow the system to finish startup.
+     */
     private static final int DEFAULT_GRACE_PERIOD = 0;
 
     /**
-     * @param settings The settings for this collector.
-     * @param client The client for handling the conversation for collecting the audit trails.
-     * @param store The storage of the audit trails data.
+     * @param settings        The settings for this collector.
+     * @param client          The client for handling the conversation for collecting the audit trails.
+     * @param store           The storage of the audit trails data.
      * @param alarmDispatcher the alarm dispatcher. Can be null.
      */
-    public AuditTrailCollector(Settings settings, AuditTrailClient client, AuditTrailStore store, 
-            AlarmDispatcher alarmDispatcher) {
+    public AuditTrailCollector(Settings settings, AuditTrailClient client, AuditTrailStore store,
+                               AlarmDispatcher alarmDispatcher) {
         ArgumentValidator.checkNotNull(settings, "settings");
         ArgumentValidator.checkNotNull(client, "AuditTrailClient client");
         ArgumentValidator.checkNotNull(store, "AuditTrailStore store");
@@ -73,32 +71,32 @@ public AuditTrailCollector(Settings settings, AuditTrailClient client, AuditTrai
         this.settings = settings;
         this.timer = new Timer(true);
         long collectionInterval = settings.getReferenceSettings().getAuditTrailServiceSettings().getCollectAuditInterval();
-        
-        for(Collection c : settings.getRepositorySettings().getCollections().getCollection()) {
+
+        for (Collection c : settings.getRepositorySettings().getCollections().getCollection()) {
             IncrementalCollector collector = new IncrementalCollector(c.getID(),
                     settings.getReferenceSettings().getAuditTrailServiceSettings().getID(),
                     client, store,
-                    SettingsUtils.getMaxClientPageSize(), 
+                    SettingsUtils.getMaxClientPageSize(),
                     alarmDispatcher);
-            AuditTrailCollectionTimerTask collectorTask = new AuditTrailCollectionTimerTask( 
+            AuditTrailCollectionTimerTask collectorTask = new AuditTrailCollectionTimerTask(
                     collector, collectionInterval, getGracePeriod());
             log.info("Will start collection of audit trail every " +
                     TimeUtils.millisecondsToHuman(collectionInterval) + ", " +
                     "after a grace period of " + TimeUtils.millisecondsToHuman(getGracePeriod()));
-            timer.scheduleAtFixedRate(collectorTask, getGracePeriod(), collectionInterval/10);
+            timer.scheduleAtFixedRate(collectorTask, getGracePeriod(), collectionInterval / 10);
             collectorTasks.put(c.getID(), collectorTask);
         }
     }
-    
+
     public CollectorInfo getCollectorInfo(String collectionID) {
         CollectorInfo info = new CollectorInfo();
         info.setCollectionID(collectionID);
         Date lastStart = collectorTasks.get(collectionID).getLastCollectionStart();
         Date lastFinish = collectorTasks.get(collectionID).getLastCollectionFinish();
         Date nextRun = collectorTasks.get(collectionID).getNextScheduledRun();
-        if(lastStart != null) {
+        if (lastStart != null) {
             info.setLastStart(TimeUtils.shortDate(lastStart));
-            if(lastFinish != null) {
+            if (lastFinish != null) {
                 long duration = lastFinish.getTime() - lastStart.getTime();
                 info.setLastDuration(TimeUtils.millisecondsToHuman(duration));
             } else {
@@ -112,9 +110,10 @@ public CollectorInfo getCollectorInfo(String collectionID) {
         info.setCollectedAudits(collectorTasks.get(collectionID).getLastNumberOfCollectedAudits());
         return info;
     }
-    
+
     /**
      * Instantiates a collection of all the newest audit trails.
+     *
      * @param collectionID the collectionID
      */
     public void collectNewestAudits(String collectionID) {
@@ -132,13 +131,13 @@ private int getGracePeriod() {
             return DEFAULT_GRACE_PERIOD;
         }
     }
-    
+
     /**
      * Closes the AuditTrailCollector.
      */
     public void close() {
-        for(AuditTrailCollectionTimerTask atctt : collectorTasks.values()) {
-            atctt.cancel();
+        for (AuditTrailCollectionTimerTask timerTask : collectorTasks.values()) {
+            timerTask.cancel();
         }
         timer.cancel();
     }
diff --git a/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/collector/CollectionSchedule.java b/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/collector/CollectionSchedule.java
index 02b792b4c..5af2b6505 100644
--- a/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/collector/CollectionSchedule.java
+++ b/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/collector/CollectionSchedule.java
@@ -8,12 +8,12 @@
  * it under the terms of the GNU Lesser General Public License as
  * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
@@ -24,24 +24,24 @@
 import java.util.Date;
 
 /**
- * Class to handle the information about previous, current and future 
- * timing and schedule of Audittrail collection 
- * Next run is at first scheduled as the interval after the current collection. 
- * When a collection has been finished, the next run is updated so the 
+ * Class to handle the information about previous, current and future
+ * timing and schedule of AuditTrail collection
+ * Next run is at first scheduled as the interval after the current collection.
+ * When a collection has been finished, the next run is updated so the
  * interval is after a collection has finished.
  */
 public class CollectionSchedule {
-
-    private Date nextRun = null;
+    private Date nextRun;
     private Date lastStart = null;
     private Date lastFinish = null;
     private Date currentStart = null;
     private final long schedulingInterval;
-    
+
     /**
-     * Constructor to create the CollectionSchedule. 
+     * Constructor to create the CollectionSchedule.
+     *
      * @param schedulingInterval The interval at which to schedule collection
-     * @param gracePeriod The grace period to wait before the first scheduling the first collection 
+     * @param gracePeriod        The grace period to wait before the first scheduling the first collection
      */
     public CollectionSchedule(long schedulingInterval, int gracePeriod) {
         this.schedulingInterval = schedulingInterval;
@@ -49,48 +49,48 @@ public CollectionSchedule(long schedulingInterval, int gracePeriod) {
     }
 
     /**
-     * @return  the date of the next scheduled collection
+     * @return the date of the next scheduled collection
      */
     public Date getNextRun() {
         return nextRun;
     }
-    
+
     /**
-     * @return  the date of the last finished collection, or the current collection if non has finished yet.
+     * @return the date of the last finished collection, or the current collection if non has finished yet.
      * May return null, if the first collection has not yet been started.
      */
     public Date getLastStart() {
         return lastStart;
     }
-    
+
     /**
-     * @return  the date of the last finished collection. Returns null if no collection has finished yet.
+     * @return the date of the last finished collection. Returns null if no collection has finished yet.
      */
     public Date getLastFinish() {
         return lastFinish;
     }
-    
+
     /**
-     * @return  the date of the currently running collection. Returns null, if no collection is currently running.
+     * @return the date of the currently running collection. Returns null, if no collection is currently running.
      */
     public Date getCurrentStart() {
         return currentStart;
     }
-    
+
     /**
      * Indicate that a collection has been started.
      * Updates the next scheduled collection.
      */
     public void start() {
         currentStart = new Date(System.currentTimeMillis());
-        if(lastStart == null) {
+        if (lastStart == null) {
             lastStart = currentStart;
         }
         nextRun = new Date(currentStart.getTime() + schedulingInterval);
     }
-    
+
     /**
-     * Indicate that a collection has finished. 
+     * Indicate that a collection has finished.
      * Updates the next scheduled collection.
      */
     public void finish() {
@@ -99,5 +99,5 @@ public void finish() {
         currentStart = null;
         nextRun = new Date(lastFinish.getTime() + schedulingInterval);
     }
-    
+
 }
diff --git a/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/collector/IncrementalCollector.java b/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/collector/IncrementalCollector.java
index 115ca285a..e36a9115d 100644
--- a/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/collector/IncrementalCollector.java
+++ b/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/collector/IncrementalCollector.java
@@ -5,28 +5,22 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.audittrails.collector;
 
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.LinkedList;
-import java.util.List;
-
 import org.bitrepository.access.getaudittrails.AuditTrailClient;
 import org.bitrepository.access.getaudittrails.AuditTrailQuery;
 import org.bitrepository.access.getaudittrails.BlockingAuditTrailClient;
@@ -43,32 +37,41 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+
 /**
  * Will perform a single collection of audit trails, potential through multiple sequential getAuditTrail calls if the
  * set of new audit trails is large.
  */
 public class IncrementalCollector {
-    private Logger log = LoggerFactory.getLogger(getClass());
+    private final Logger log = LoggerFactory.getLogger(getClass());
     private final String clientID;
     private final BlockingAuditTrailClient client;
     private final AuditTrailStore store;
     private final int maxNumberOfResults;
     private final AlarmDispatcher alarmDispatcher;
 
-    /** When no file id is wanted for the collecting of audit trails.*/
+    /**
+     * When no file id is wanted for the collecting of audit trails.
+     */
     private static final String NO_FILE_ID = null;
-    /** When no delivery address is wanted for the collecting of audit trails.*/
+    /**
+     * When no delivery address is wanted for the collecting of audit trails.
+     */
     private static final String NO_DELIVERY_URL = null;
     private final String collectionID;
     private long collectedAudits = 0;
 
     /**
-     * @param collectionID the collection ID
-     * @param clientID The clientID to use for the requests.
-     * @param client The client to use for the operations.
-     * @param store Where to persist the received results.
+     * @param collectionID       the collection ID
+     * @param clientID           The clientID to use for the requests.
+     * @param client             The client to use for the operations.
+     * @param store              Where to persist the received results.
      * @param maxNumberOfResults A optional limit on the number of audit trail events to request. If not set, {}
-     * @param alarmDispatcher the alarm dispatcher
+     * @param alarmDispatcher    the alarm dispatcher
      */
     public IncrementalCollector(String collectionID, String clientID, AuditTrailClient client, AuditTrailStore store,
                                 int maxNumberOfResults, AlarmDispatcher alarmDispatcher) {
@@ -82,72 +85,75 @@ public IncrementalCollector(String collectionID, String clientID, AuditTrailClie
 
     /**
      * Method to get the ID of the collection to get audit trails from
-     * @return String The ID of the collection 
+     *
+     * @return String The ID of the collection
      */
     public String getCollectionID() {
         return collectionID;
     }
-    
+
     /**
-     * Get the number of collected audit trails during this collection 
+     * Get the number of collected audit trails during this collection
+     *
      * @return long The number of collected audit trails
      */
     public long getNumberOfCollectedAudits() {
         return collectedAudits;
     }
-    
+
     /**
      * Setup and initiates the collection of audit trails through the client.
      * Adds one to the sequence number to request only newer audit trails.
+     *
      * @param contributors the collection of IDs of contributor
      */
     public void performCollection(Collection<String> contributors) {
         collectedAudits = 0;
-        long start = System.currentTimeMillis(); 
-                
-        log.debug("Starting collection of audittrails for collection '{}'", collectionID);
+        long start = System.currentTimeMillis();
+
+        log.debug("Starting collection of AuditTrails for collection '{}'", collectionID);
         Collection<String> activeContributors = contributors;
-        while(!activeContributors.isEmpty()) {
+        while (!activeContributors.isEmpty()) {
             activeContributors = collect(activeContributors);
         }
-        log.debug("Finished collecting audittrails for collection '{}', collected {} audit trails it took {}.", 
-                collectionID, collectedAudits, TimeUtils.millisecondsToHuman(System.currentTimeMillis() - start));
+        log.debug("Finished collecting AuditTrails for collection '{}', collected {} audit trails it took {}.", collectionID,
+                collectedAudits, TimeUtils.millisecondsToHuman(System.currentTimeMillis() - start));
     }
-    
+
     /**
      * Collect a page of audit trails from the active contributors
+     *
      * @param contributors The contributors to collect from
-     * @return Collection<String> the contributors that have more audits to collect 
+     * @return Collection<String> the contributors that have more audits to collect
      */
     private Collection<String> collect(Collection<String> contributors) {
         List<AuditTrailQuery> queries = new ArrayList<>();
-        
-        for(String contributorId : contributors) {
+
+        for (String contributorId : contributors) {
             long seq = store.largestSequenceNumber(contributorId, collectionID);
             queries.add(new AuditTrailQuery(contributorId, seq + 1, null, maxNumberOfResults));
         }
 
-        log.debug("Collecting of audittrails for '{}' with ContributorQueries: {}", collectionID, queries);
-        
+        log.debug("Collecting of AuditTrails for '{}' with ContributorQueries: {}", collectionID, queries);
+
         AuditCollectorEventHandler handler = new AuditCollectorEventHandler();
         try {
-            client.getAuditTrails(collectionID, queries.toArray(new AuditTrailQuery[queries.size()]), NO_FILE_ID,
-                    NO_DELIVERY_URL, handler, clientID);
+            client.getAuditTrails(collectionID, queries.toArray(new AuditTrailQuery[0]), NO_FILE_ID, NO_DELIVERY_URL, handler,
+                    clientID);
 
         } catch (NegativeResponseException e) {
-            log.error("Problem in collecting audittrails, collection will not be complete for collection '{}'",
-                    collectionID, e);
+            log.error("Problem in collecting AuditTrails, collection will not be complete for collection '{}'", collectionID, e);
             Alarm alarm = new Alarm();
             alarm.setAlarmCode(AlarmCode.COMPONENT_FAILURE);
-            alarm.setAlarmText("Failed to collect audit trails. Error was: '" + e.toString() + "'");
+            alarm.setAlarmText("Failed to collect audit trails. Error was: '" + e + "'");
             alarm.setCollectionID(collectionID);
             alarmDispatcher.error(alarm);
         }
         return handler.getContributorsWithPartialResults();
     }
-    
+
     /**
-     * Event handler for the audit trail collector. The results of an audit trail operation will be ingested into the
+     * Event handler for the audit trail collector. The results of an AuditTrail operation will be ingested into the
      * audit trail store.
      */
     private class AuditCollectorEventHandler implements EventHandler {
@@ -157,14 +163,13 @@ private class AuditCollectorEventHandler implements EventHandler {
         Collection<String> getContributorsWithPartialResults() {
             return contributorsWithPartialResults;
         }
-        
+
         @Override
         public void handleEvent(OperationEvent event) {
-            if(event instanceof AuditTrailResult) {
+            if (event instanceof AuditTrailResult) {
                 AuditTrailResult auditResult = (AuditTrailResult) event;
                 if (!auditResult.getCollectionID().equals(collectionID)) {
-                    log.warn("Received bad collection id! Expected '{}', but got '{}'.", 
-                            collectionID, auditResult.getCollectionID());
+                    log.warn("Received bad collection id! Expected '{}', but got '{}'.", collectionID, auditResult.getCollectionID());
                     return;
                 }
                 if (auditResult.isPartialResult()) {
@@ -174,17 +179,16 @@ public void handleEvent(OperationEvent event) {
                 if (events != null && events.getAuditTrailEvent() != null && !events.getAuditTrailEvent().isEmpty()) {
                     store.addAuditTrails(events, collectionID, auditResult.getContributorID());
                     collectedAudits += events.getAuditTrailEvent().size();
-                    log.debug("Collected and stored {} audit trail event(s) for '{}' from {} in {} (PartialResult={}).", 
-                            events.getAuditTrailEvent().size(), collectionID, auditResult.getContributorID(), 
-                            TimeUtils.millisecondsToHuman(System.currentTimeMillis() - startTime), 
-                            auditResult.isPartialResult());
+                    log.debug("Collected and stored {} audit trail event(s) for '{}' from {} in {} (PartialResult={}).",
+                            events.getAuditTrailEvent().size(), collectionID, auditResult.getContributorID(),
+                            TimeUtils.millisecondsToHuman(System.currentTimeMillis() - startTime), auditResult.isPartialResult());
                 }
             } else if (event.getEventType() == OperationEvent.OperationEventType.COMPONENT_FAILED ||
-                event.getEventType() == OperationEvent.OperationEventType.FAILED ||
-                event.getEventType() == OperationEvent.OperationEventType.IDENTIFY_TIMEOUT) {
-                log.warn("Event: {}", event.toString());
+                    event.getEventType() == OperationEvent.OperationEventType.FAILED ||
+                    event.getEventType() == OperationEvent.OperationEventType.IDENTIFY_TIMEOUT) {
+                log.warn("Event: {}", event);
             } else {
-                log.debug("Event: {}", event.toString());
+                log.debug("Event: {}", event);
             }
         }
     }
diff --git a/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/preserver/AuditPacker.java b/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/preserver/AuditPacker.java
index 68b1e93cf..01edfa8a2 100644
--- a/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/preserver/AuditPacker.java
+++ b/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/preserver/AuditPacker.java
@@ -5,68 +5,70 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.audittrails.preserver;
 
+import org.bitrepository.audittrails.store.AuditEventIterator;
+import org.bitrepository.audittrails.store.AuditTrailStore;
+import org.bitrepository.bitrepositoryelements.AuditTrailEvent;
+import org.bitrepository.common.utils.FileUtils;
+import org.bitrepository.common.utils.SettingsUtils;
+import org.bitrepository.settings.referencesettings.AuditTrailPreservation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.PrintWriter;
 import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.bitrepository.audittrails.store.AuditEventIterator;
-import org.bitrepository.audittrails.store.AuditTrailStore;
-import org.bitrepository.bitrepositoryelements.AuditTrailEvent;
-import org.bitrepository.common.utils.FileUtils;
-import org.bitrepository.common.utils.SettingsUtils;
-import org.bitrepository.settings.referencesettings.AuditTrailPreservation;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
  * Performs the extraction and packaging of audit trails for preservation for a specific collection.
- * Only packs the audit trails with a larger sequence number than the reached sequence number for the given 
+ * Only packs the audit trails with a larger sequence number than the reached sequence number for the given
  * contributor.
  */
 public class AuditPacker {
-    /** The log.*/
     private final Logger log = LoggerFactory.getLogger(getClass());
-    /** The audit trail store.*/
     private final AuditTrailStore store;
-    /** The id of the collection to pack audits for.*/
     private final String collectionID;
-    /** The list of contributors for this collection. */
     private final List<String> contributors = new ArrayList<>();
-    /** The directory where the temporary files are stored.*/
+    /**
+     * The directory where the temporary files are stored.
+     */
     private final File directory;
-    /** Map between the contributor id and the reached preservation sequence number. */
-    private Map<String, Long> seqReached = new HashMap<>();
-        
-    /** Whether the output stream should be appended to the file.*/
+    /**
+     * Map between the contributor id and the reached preservation sequence number.
+     */
+    private final Map<String, Long> seqReached = new HashMap<>();
+    /**
+     * Whether the output stream should be appended to the file.
+     */
     private static final boolean APPEND = true;
-    
+
     /**
      * Constructor.
-     * @param store The audit trail store
-     * @param settings the settings
+     *
+     * @param store        The audit trail store
+     * @param settings     the settings
      * @param collectionID the collection ID
      */
     public AuditPacker(AuditTrailStore store, AuditTrailPreservation settings, String collectionID) {
@@ -74,110 +76,115 @@ public AuditPacker(AuditTrailStore store, AuditTrailPreservation settings, Strin
         this.collectionID = collectionID;
         this.directory = FileUtils.retrieveDirectory(settings.getAuditTrailPreservationTemporaryDirectory());
         this.contributors.addAll(SettingsUtils.getAuditContributorsForCollection(collectionID));
-        
+
         initialiseReachedSequenceNumbers();
     }
-    
+
     /**
      * Makes a copy of the map, which is returned.
+     *
      * @return A mapping between the contributor ids and their preservation sequence numbers.
      */
     public Map<String, Long> getSequenceNumbersReached() {
         return new HashMap<>(seqReached);
     }
-    
+
     /**
      * Retrieves the preservation sequence number for each contributor and inserts it into the map.
      */
     private void initialiseReachedSequenceNumbers() {
-        for(String contributor : contributors) {
+        for (String contributor : contributors) {
             Long seq = store.getPreservationSequenceNumber(contributor, collectionID);
             seqReached.put(contributor, seq);
         }
     }
-    
+
     /**
-     * Creates a new package with all the newest audit trails from all contributors, e.g. all the audit trails with a 
+     * Creates a new package with all the newest audit trails from all contributors, e.g. all the audit trails with a
      * larger sequence number than the reached.
      * Cleans up the temporary container afterwards.
-     * @return A compressed file with all the audit trails. 
+     *
+     * @return A compressed file with all the audit trails.
      */
     public synchronized File createNewPackage() {
         File container = new File(directory, collectionID + "-audit-trails-" + System.currentTimeMillis());
         try {
-            container.createNewFile();
-            packContributors(container);
-            return createCompressedFile(container);
+            if (container.createNewFile()) {
+                packContributors(container);
+                return createCompressedFile(container);
+            }
         } catch (IOException e) {
             throw new IllegalStateException("Cannot package the newest audit trails.", e);
         } finally {
             // cleaning up.
-            if(container.exists()) {
+            if (container.exists()) {
                 FileUtils.delete(container);
             }
         }
+        return null;
     }
-    
+
     /**
      * Packs all newest audit trails from every contributor into the given file.
+     *
      * @param container The file where the audit trails should be written.
      * @throws IOException If writing to the file somehow fails.
      */
     private void packContributors(File container) throws IOException {
         PrintWriter writer = null;
         try {
-            writer = new PrintWriter(
-                    new OutputStreamWriter(new FileOutputStream(container, APPEND), StandardCharsets.UTF_8));
-            for(String contributor : contributors) {
+            writer = new PrintWriter(new OutputStreamWriter(new FileOutputStream(container, APPEND), StandardCharsets.UTF_8));
+            for (String contributor : contributors) {
                 packContributor(contributor, writer);
             }
         } finally {
-            if(writer != null) {
+            if (writer != null) {
                 writer.flush();
                 writer.close();
             }
         }
     }
-    
+
     /**
      * Writes all the newest audit trails for a single contributor to the PrintWriter.
+     *
      * @param contributorId The id of the contributor to write the files for.
-     * @param writer The PrinterWriter where the output will be written.
+     * @param writer        The PrinterWriter where the output will be written.
      */
     private void packContributor(String contributorId, PrintWriter writer) {
         long nextSeqNumber = store.getPreservationSequenceNumber(contributorId, collectionID);
         long largestSeqNumber = -1;
         long numPackedAudits = 0;
-        log.debug("Starting to pack audittrails for contributor: " + contributorId + " for collection: " + collectionID);
-        AuditEventIterator iterator = store.getAuditTrailsByIterator(null, collectionID, contributorId, nextSeqNumber,
-                null, null, null, null, null, null, null);
+        log.debug("Starting to pack AuditTrails for contributor: " + contributorId + " for collection: " + collectionID);
+        AuditEventIterator iterator = store.getAuditTrailsByIterator(null, collectionID, contributorId, nextSeqNumber, null,
+                null, null, null, null, null, null);
         long timeStart = System.currentTimeMillis();
         long logInterval = 1000;
 
         AuditTrailEvent event;
         log.debug("AuditEventIterator created");
-        while((event = iterator.getNextAuditTrailEvent()) != null) {
+        while ((event = iterator.getNextAuditTrailEvent()) != null) {
             numPackedAudits++;
-            if(largestSeqNumber < event.getSequenceNumber().longValue()) {
+            if (largestSeqNumber < event.getSequenceNumber().longValue()) {
                 largestSeqNumber = event.getSequenceNumber().longValue();
             }
-            writer.println(event.toString());
-            
-            if((numPackedAudits % logInterval) == 0) {
-                log.debug("Packed " + numPackedAudits + " audittrails in: " + (System.currentTimeMillis() - timeStart) + " ms");
+            writer.println(event);
+
+            if ((numPackedAudits % logInterval) == 0) {
+                log.debug("Packed " + numPackedAudits + " AuditTrails in: " + (System.currentTimeMillis() - timeStart) + " ms");
             }
         }
-        log.debug("Packed a total of: " + numPackedAudits + " audittrails in: " + (System.currentTimeMillis() - timeStart) + " ms");
-        if(numPackedAudits > 0) {
+        log.debug("Packed a total of: " + numPackedAudits + " AuditTrails in: " + (System.currentTimeMillis() - timeStart) + " ms");
+        if (numPackedAudits > 0) {
             seqReached.put(contributorId, largestSeqNumber);
         }
     }
-    
+
     /**
      * Compresses the given file into a zip-file.
      * It will have the same name as the file to compress, just with the extension '.zip', and it will
      * be placed in the directory defined in settings.
-     * 
+     *
      * @param fileToCompress The file to compress.
      * @return The compressed file.
      * @throws IOException If anything goes wrong.
diff --git a/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/preserver/AuditPreservationEventHandler.java b/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/preserver/AuditPreservationEventHandler.java
index e97dbe8d2..54b1faa77 100644
--- a/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/preserver/AuditPreservationEventHandler.java
+++ b/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/preserver/AuditPreservationEventHandler.java
@@ -5,24 +5,22 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.audittrails.preserver;
 
-import java.util.Map;
-
 import org.bitrepository.audittrails.store.AuditTrailStore;
 import org.bitrepository.client.eventhandler.EventHandler;
 import org.bitrepository.client.eventhandler.OperationEvent;
@@ -30,54 +28,51 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Map;
+
 /**
  * The event handler for the preservation of audit trail data.
  * When the PutFile operation has completed, then the store will be updated with the results.
- * 
+ * <p>
  * It is not necessary to wait until all the components are complete. Just the first.
- * This eventhandler can only be used for handling the PutFile operation of a single AuditTrail package.
+ * This EventHandler can only be used for handling the PutFile operation of a single AuditTrail package.
  */
 public class AuditPreservationEventHandler implements EventHandler {
-    /** The log.*/
-    private Logger log = LoggerFactory.getLogger(getClass());
-    /** The map between the contributors and their sequence number.*/
+    private final Logger log = LoggerFactory.getLogger(getClass());
     private final Map<String, Long> seqNumbers;
-    /** The store for the audit trails. Where the new preservation sequence numbers should be inserted.*/
     private final AuditTrailStore store;
-    /** The collection which preservation sequence number needs to be updated. */
     private final String collectionID;
-    
+
     /**
-     * Constructor.
      * @param preservationSequenceNumber The map between the contributor ids and their respective sequence number.
-     * @param store The store which should be updated with these sequence numbers.
-     * @param collectionID The ID of the collection that needs to have it's sequence number updated. 
+     * @param store                      The store which should be updated with these sequence numbers.
+     * @param collectionID               The ID of the collection that needs to have its sequence number updated.
      */
     public AuditPreservationEventHandler(Map<String, Long> preservationSequenceNumber, AuditTrailStore store, String collectionID) {
         this.seqNumbers = preservationSequenceNumber;
         this.store = store;
         this.collectionID = collectionID;
     }
-    
+
     @Override
     public void handleEvent(OperationEvent event) {
-        if(event.getEventType() == OperationEventType.COMPLETE) {
+        if (event.getEventType() == OperationEventType.COMPLETE) {
             updateStoreWithResults();
         } else {
             log.debug("Event for preservation of audit trails: " + event.toString());
         }
     }
-    
+
     /**
      * Update the store with the results.
      */
     private void updateStoreWithResults() {
-        for(Map.Entry<String, Long> entry : seqNumbers.entrySet()) {
-            if(store.havePreservationKey(entry.getKey(), collectionID)) {
+        for (Map.Entry<String, Long> entry : seqNumbers.entrySet()) {
+            if (store.havePreservationKey(entry.getKey(), collectionID)) {
                 store.setPreservationSequenceNumber(entry.getKey(), collectionID, entry.getValue());
             } else {
-                log.debug("Preservation key for contributor: " + entry.getKey() + " in collection: "
-                        + collectionID + " is not known by the database.");
+                log.debug("Preservation key for contributor: " + entry.getKey() + " in collection: " + collectionID +
+                        " is not known by the database.");
             }
         }
     }
diff --git a/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/preserver/AuditTrailPreserver.java b/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/preserver/AuditTrailPreserver.java
index e05d7e167..b3d8ae992 100644
--- a/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/preserver/AuditTrailPreserver.java
+++ b/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/preserver/AuditTrailPreserver.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -30,12 +30,12 @@ public interface AuditTrailPreserver {
      * Start the preservation of audit trails.
      */
     void start();
-    
+
     /**
-     * Method for performing the preservation of the unpreserved audit trails, around the scheduled preservation.
+     * Method for performing the preservation of the un-preserved audit trails, around the scheduled preservation.
      */
     void preserveRepositoryAuditTrails();
-    
+
     /**
      * Stop the preservation of audit trails.
      */
diff --git a/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/preserver/LocalAuditTrailPreserver.java b/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/preserver/LocalAuditTrailPreserver.java
index 5153a2249..b83ab1204 100644
--- a/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/preserver/LocalAuditTrailPreserver.java
+++ b/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/preserver/LocalAuditTrailPreserver.java
@@ -5,32 +5,22 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.audittrails.preserver;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.net.URL;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Timer;
-import java.util.TimerTask;
-
 import org.bitrepository.audittrails.store.AuditTrailStore;
 import org.bitrepository.bitrepositoryelements.ChecksumDataForFileTYPE;
 import org.bitrepository.bitrepositoryelements.ChecksumSpecTYPE;
@@ -52,63 +42,60 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.net.URL;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Timer;
+import java.util.TimerTask;
+
 /**
  * Handles the preservation of audit trails to a collection defined for the local repository.
  * This means, that each set of audit trails will be preserved within its own collection.
  */
 public class LocalAuditTrailPreserver implements AuditTrailPreserver {
-    /** The log.*/
     private final Logger log = LoggerFactory.getLogger(getClass());
-    /** The audit trails store, where the audit trails can be extracted.*/
     private final AuditTrailStore store;
-    /** The put file client for sending the resulting files. */
     private final BlockingPutFileClient client;
-
-    /** The timer for scheduling the preservation of audit trails.*/
     private Timer timer;
-    /** The timertask for preserving the audit trails.*/
     private AuditPreservationTimerTask auditTask = null;
-    /** The mapping between collection and the Audit trail packer for packing and compressing the audit trails.*/
     private final Map<String, AuditPacker> auditPackers = new HashMap<>();
-    /** The preservationSettings for the local audit trail preserver.*/
     private final AuditTrailPreservation preservationSettings;
-    /** The full settings (needed for checksum calculation) */
     private final Settings settings;
-    /** The fileexchange to use for uploading files which should be put to the preservation collection */
     private final FileExchange exchange;
-    
+
     /**
-     * Constructor.
      * @param settings The preservationSettings for the audit trail service.
-     * @param store The storage of the audit trails, which should be preserved.
-     * @param client The PutFileClient for putting the audit trail packages to the collection.
+     * @param store    The storage of the audit trails, which should be preserved.
+     * @param client   The PutFileClient for putting the audit trail packages to the collection.
      */
-    public LocalAuditTrailPreserver(Settings settings, AuditTrailStore store, PutFileClient client,
-                                    FileExchange exchange) {
+    public LocalAuditTrailPreserver(Settings settings, AuditTrailStore store, PutFileClient client, FileExchange exchange) {
         ArgumentValidator.checkNotNull(settings, "Settings preservationSettings");
         ArgumentValidator.checkNotNull(store, "AuditTrailStore store");
         ArgumentValidator.checkNotNull(client, "PutFileClient client");
-        
+
         this.settings = settings;
         this.preservationSettings = settings.getReferenceSettings().getAuditTrailServiceSettings().getAuditTrailPreservation();
         this.store = store;
         this.client = new BlockingPutFileClient(client);
         this.exchange = exchange;
-        for(String collectionID : SettingsUtils.getAllCollectionsIDs()) {
+        for (String collectionID : SettingsUtils.getAllCollectionsIDs()) {
             this.auditPackers.put(collectionID, new AuditPacker(store, preservationSettings, collectionID));
         }
     }
-    
+
     @Override
     public void start() {
-        if(timer != null) {
+        if (timer != null) {
             log.debug("Cancelling old timer.");
             timer.cancel();
         }
         long preservationInterval = preservationSettings.getAuditTrailPreservationInterval();
-        long timerCheckInterval = preservationInterval/10;
-        log.info("Instantiating the preservation of audit trails every " +
-                TimeUtils.millisecondsToHuman(preservationInterval));
+        long timerCheckInterval = preservationInterval / 10;
+        log.info("Instantiating the preservation of audit trails every " + TimeUtils.millisecondsToHuman(preservationInterval));
         timer = new Timer();
         auditTask = new AuditPreservationTimerTask(preservationInterval);
         timer.scheduleAtFixedRate(auditTask, timerCheckInterval, timerCheckInterval);
@@ -116,29 +103,30 @@ public void start() {
 
     @Override
     public void close() {
-        if(timer != null) {
+        if (timer != null) {
             timer.cancel();
         }
     }
 
     @Override
     public void preserveRepositoryAuditTrails() {
-        if(auditTask == null) {
+        if (auditTask == null) {
             log.info("preserving the audit trails ");
         } else {
             auditTask.resetTime();
         }
-        for(String collectionID : SettingsUtils.getAllCollectionsIDs()) {
+        for (String collectionID : SettingsUtils.getAllCollectionsIDs()) {
             performAuditTrailPreservation(collectionID);
         }
     }
-    
+
     /**
      * Performs the audit trails preservation.
      * Uses the AuditPacker to pack the audit trails in a file, then uploads the file to the default file-server, and
      * finally use the PutFileClient to ingest the package into the collection.
-     * When the 'put' has completed the Store is updated with the newest preservation sequence numbers for the 
+     * When the 'put' has completed the Store is updated with the newest preservation sequence numbers for the
      * contributors.
+     *
      * @param collectionID The id of the collection whose audit trails should be preserved.
      */
     private synchronized void performAuditTrailPreservation(String collectionID) {
@@ -146,14 +134,13 @@ private synchronized void performAuditTrailPreservation(String collectionID) {
             File auditPackage = auditPackers.get(collectionID).createNewPackage();
             URL url = uploadFile(auditPackage);
             log.info("Uploaded the file '" + auditPackage + "' to '" + url.toExternalForm() + "'");
-            
+
             ChecksumDataForFileTYPE checksumData = getValidationChecksumDataForFile(auditPackage);
-            
-            EventHandler eventHandler = new AuditPreservationEventHandler(
-                    auditPackers.get(collectionID).getSequenceNumbersReached(), store, collectionID);
-            client.putFile(preservationSettings.getAuditTrailPreservationCollection(), url,
-                    auditPackage.getName(), auditPackage.length(), checksumData, null, eventHandler,
-                    "Preservation of audit trails from the AuditTrail service.");
+
+            EventHandler eventHandler = new AuditPreservationEventHandler(auditPackers.get(collectionID).getSequenceNumbersReached(), store,
+                    collectionID);
+            client.putFile(preservationSettings.getAuditTrailPreservationCollection(), url, auditPackage.getName(), auditPackage.length(),
+                    checksumData, null, eventHandler, "Preservation of audit trails from the AuditTrail service.");
 
             log.debug("Cleanup of the uploaded audit trail package.");
             FileUtils.delete(auditPackage);
@@ -163,9 +150,9 @@ private synchronized void performAuditTrailPreservation(String collectionID) {
             throw new CoordinationLayerException("Failed to put the packed audit trails.", e);
         }
     }
-    
+
     /**
-     * Helper method to make a checksum for the putfile call. 
+     * Helper method to make a checksum for the PutFile call.
      */
     private ChecksumDataForFileTYPE getValidationChecksumDataForFile(File file) {
         ChecksumSpecTYPE csSpec = ChecksumUtils.getDefault(settings);
@@ -177,10 +164,11 @@ private ChecksumDataForFileTYPE getValidationChecksumDataForFile(File file) {
         res.setChecksumValue(Base16Utils.encodeBase16(checksum));
 
         return res;
-    } 
-    
+    }
+
     /**
      * Uploads the file to a server.
+     *
      * @param file The file to upload.
      * @return The URL to the file.
      * @throws IOException If any issues occur with uploading the file.
@@ -190,40 +178,37 @@ private URL uploadFile(File file) throws IOException {
         exchange.putFile(new FileInputStream(file), uploadedFileURL);
         return uploadedFileURL;
     }
-    
+
     /**
      * Timer task for keeping track of the automated collecting of audit trails.
      */
     private class AuditPreservationTimerTask extends TimerTask {
-        /** The interval between running this timer task.*/
         private final long interval;
-        /** The date for the next run.*/
         private Date nextRun;
-        
+
         /**
-         * Constructor.
          * @param interval The interval between running this timer task.
          */
         private AuditPreservationTimerTask(long interval) {
             this.interval = interval;
             resetTime();
         }
-        
+
         /**
          * Resets the date for next run.
          */
         private void resetTime() {
             nextRun = new Date(System.currentTimeMillis() + interval);
         }
-        
+
         @Override
         public void run() {
-            if(nextRun.getTime() < System.currentTimeMillis()) {
+            if (nextRun.getTime() < System.currentTimeMillis()) {
                 try {
                     log.debug("Time to preserve the audit trails.");
                     preserveRepositoryAuditTrails();
                 } catch (Exception e) {
-                    log.error("Caught exception while attempting to preserve audittrails", e);
+                    log.error("Caught exception while attempting to preserve AuditTrails", e);
                 }
                 resetTime();
             }
diff --git a/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/store/AuditDatabaseConstants.java b/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/store/AuditDatabaseConstants.java
index c0b91ea22..ccafc66f4 100644
--- a/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/store/AuditDatabaseConstants.java
+++ b/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/store/AuditDatabaseConstants.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -26,76 +26,140 @@
  * All the names of the tables and the fields in these tables.
  */
 public final class AuditDatabaseConstants {
-    
-    /** Private constructor to prevent instantiation of this constants class.*/
-    private AuditDatabaseConstants() { }
-    
-    /** The name of the audit trail table.*/
-    public final static String AUDITTRAIL_TABLE = "audittrail";
-    /** The name of the key field for the entries in the table.*/
-    public final static String AUDITTRAIL_KEY = "audit_key";
-    /** The name of the sequence number field in the audit trail table. */
-    public final static String AUDITTRAIL_SEQUENCE_NUMBER = "sequence_number";
-    /** The name of teh contributor key in the audit trail table.*/
-    public final static String AUDITTRAIL_CONTRIBUTOR_KEY = "contributor_key";
-    /** The name of the file key field in the audit trail table. */
-    public final static String AUDITTRAIL_FILE_KEY = "file_key";
-    /** The name of the actor key field in the audit trail table. */
-    public final static String AUDITTRAIL_ACTOR_KEY = "actor_key";
-    /** The name of the operation field in the audit trail table. */
-    public final static String AUDITTRAIL_OPERATION = "operation";
-    /** The name of the operation date field in the audit trail table. */
-    public final static String AUDITTRAIL_OPERATION_DATE = "operation_date";
-    /** The name of the audit field in the audit trail table. */
-    public final static String AUDITTRAIL_AUDIT = "audit";
-    /** The name of the information field in the audit trail table. */
-    public final static String AUDITTRAIL_INFORMATION = "information";
-    /** The name of the operationID field in the audit trail table. */
-    public final static String AUDITTRAIL_OPERATION_ID = "operationID";
-    /** The name of the fingerprint field in the audit trail table. */
-    public final static String AUDITTRAIL_FINGERPRINT = "fingerprint";
-    
-    /** The name of the file table.*/
+
+    /**
+     * Private constructor to prevent instantiation of this constants class.
+     */
+    private AuditDatabaseConstants() {}
+
+    /**
+     * The name of the audit trail table.
+     */
+    public final static String AUDIT_TRAIL_TABLE = "audittrail";
+    /**
+     * The name of the key field for the entries in the table.
+     */
+    public final static String AUDIT_TRAIL_KEY = "audit_key";
+    /**
+     * The name of the sequence number field in the audit trail table.
+     */
+    public final static String AUDIT_TRAIL_SEQUENCE_NUMBER = "sequence_number";
+    /**
+     * The name of teh contributor key in the audit trail table.
+     */
+    public final static String AUDIT_TRAIL_CONTRIBUTOR_KEY = "contributor_key";
+    /**
+     * The name of the file key field in the audit trail table.
+     */
+    public final static String AUDIT_TRAIL_FILE_KEY = "file_key";
+    /**
+     * The name of the actor key field in the audit trail table.
+     */
+    public final static String AUDIT_TRAIL_ACTOR_KEY = "actor_key";
+    /**
+     * The name of the operation field in the audit trail table.
+     */
+    public final static String AUDIT_TRAIL_OPERATION = "operation";
+    /**
+     * The name of the operation date field in the audit trail table.
+     */
+    public final static String AUDIT_TRAIL_OPERATION_DATE = "operation_date";
+    /**
+     * The name of the audit field in the audit trail table.
+     */
+    public final static String AUDIT_TRAIL_AUDIT = "audit";
+    /**
+     * The name of the information field in the audit trail table.
+     */
+    public final static String AUDIT_TRAIL_INFORMATION = "information";
+    /**
+     * The name of the operationID field in the audit trail table.
+     */
+    public final static String AUDIT_TRAIL_OPERATION_ID = "operationID";
+    /**
+     * The name of the fingerprint field in the audit trail table.
+     */
+    public final static String AUDIT_TRAIL_FINGERPRINT = "fingerprint";
+
+    /**
+     * The name of the file table.
+     */
     public final static String FILE_TABLE = "file";
-    /** The name of the file key field in the file table.*/
+    /**
+     * The name of the file key field in the file table.
+     */
     public final static String FILE_KEY = "file_key";
-    /** The name of the fileid field in the file table.*/
-    public final static String FILE_FILEID = "fileid";
-    /** The name of the collectionkey field in the file table.*/
+    /**
+     * The name of the fileid field in the file table.
+     */
+    public final static String FILE_FILE_ID = "fileid";
+    /**
+     * The name of the collectionkey field in the file table.
+     */
     public final static String FILE_COLLECTION_KEY = "collection_key";
-    
-    /** The name of the collection table.*/
+
+    /**
+     * The name of the collection table.
+     */
     public final static String COLLECTION_TABLE = "collection";
-    /** The key for entries in the collection table.*/
+    /**
+     * The key for entries in the collection table.
+     */
     public final static String COLLECTION_KEY = "collection_key";
-    /** The id for the collection.*/
+    /**
+     * The id for the collection.
+     */
     public final static String COLLECTION_ID = "collectionid";
-    
-    /** The name of the contributor table.*/
+
+    /**
+     * The name of the contributor table.
+     */
     public final static String CONTRIBUTOR_TABLE = "contributor";
-    /** The name of the contributor key field in the contributor table.*/
+    /**
+     * The name of the contributor key field in the contributor table.
+     */
     public final static String CONTRIBUTOR_KEY = "contributor_key";
-    /** The name of the contributor id field in the contributor table.*/
+    /**
+     * The name of the contributor id field in the contributor table.
+     */
     public final static String CONTRIBUTOR_ID = "contributor_id";
-    
-    /** The name of the actor table.*/
+
+    /**
+     * The name of the actor table.
+     */
     public final static String ACTOR_TABLE = "actor";
-    /** The name of the actor key field in the actor table.*/
+    /**
+     * The name of the actor key field in the actor table.
+     */
     public final static String ACTOR_KEY = "actor_key";
-    /** The name of the actor name field in the actor table.*/
+    /**
+     * The name of the actor name field in the actor table.
+     */
     public final static String ACTOR_NAME = "actor_name";
-    
-    /** The name of the preservation table.*/
+
+    /**
+     * The name of the preservation table.
+     */
     public final static String PRESERVATION_TABLE = "preservation";
-    /** The key for the entry in the preservation table. */
+    /**
+     * The key for the entry in the preservation table.
+     */
     public final static String PRESERVATION_KEY = "preservation_key";
-    /** The key for the collection. */
+    /**
+     * The key for the collection.
+     */
     public final static String PRESERVATION_COLLECTION_KEY = "collection_key";
-    /** The key for the contributor.*/
+    /**
+     * The key for the contributor.
+     */
     public final static String PRESERVATION_CONTRIBUTOR_KEY = "contributor_key";
-    /** The name of the preservation sequence number field in the contributor table.*/
+    /**
+     * The name of the preservation sequence number field in the contributor table.
+     */
     public final static String PRESERVATION_SEQ = "preserved_seq_number";
 
-    /** The name of the version table entry for the database.*/
+    /**
+     * The name of the version table entry for the database.
+     */
     public final static String DATABASE_VERSION_ENTRY = "auditservicedb";
 }
diff --git a/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/store/AuditDatabaseExtractor.java b/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/store/AuditDatabaseExtractor.java
index f9ab21db1..2d800da0c 100644
--- a/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/store/AuditDatabaseExtractor.java
+++ b/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/store/AuditDatabaseExtractor.java
@@ -5,36 +5,47 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.audittrails.store;
 
+import org.bitrepository.common.ArgumentValidator;
+import org.bitrepository.service.database.DBConnector;
+import org.bitrepository.service.database.DatabaseUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.sql.PreparedStatement;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
 import static org.bitrepository.audittrails.store.AuditDatabaseConstants.ACTOR_KEY;
 import static org.bitrepository.audittrails.store.AuditDatabaseConstants.ACTOR_NAME;
 import static org.bitrepository.audittrails.store.AuditDatabaseConstants.ACTOR_TABLE;
-import static org.bitrepository.audittrails.store.AuditDatabaseConstants.AUDITTRAIL_ACTOR_KEY;
-import static org.bitrepository.audittrails.store.AuditDatabaseConstants.AUDITTRAIL_AUDIT;
-import static org.bitrepository.audittrails.store.AuditDatabaseConstants.AUDITTRAIL_CONTRIBUTOR_KEY;
-import static org.bitrepository.audittrails.store.AuditDatabaseConstants.AUDITTRAIL_FILE_KEY;
-import static org.bitrepository.audittrails.store.AuditDatabaseConstants.AUDITTRAIL_INFORMATION;
-import static org.bitrepository.audittrails.store.AuditDatabaseConstants.AUDITTRAIL_OPERATION_ID;
-import static org.bitrepository.audittrails.store.AuditDatabaseConstants.AUDITTRAIL_FINGERPRINT;
-import static org.bitrepository.audittrails.store.AuditDatabaseConstants.AUDITTRAIL_OPERATION;
-import static org.bitrepository.audittrails.store.AuditDatabaseConstants.AUDITTRAIL_OPERATION_DATE;
-import static org.bitrepository.audittrails.store.AuditDatabaseConstants.AUDITTRAIL_SEQUENCE_NUMBER;
-import static org.bitrepository.audittrails.store.AuditDatabaseConstants.AUDITTRAIL_TABLE;
+import static org.bitrepository.audittrails.store.AuditDatabaseConstants.AUDIT_TRAIL_ACTOR_KEY;
+import static org.bitrepository.audittrails.store.AuditDatabaseConstants.AUDIT_TRAIL_AUDIT;
+import static org.bitrepository.audittrails.store.AuditDatabaseConstants.AUDIT_TRAIL_CONTRIBUTOR_KEY;
+import static org.bitrepository.audittrails.store.AuditDatabaseConstants.AUDIT_TRAIL_FILE_KEY;
+import static org.bitrepository.audittrails.store.AuditDatabaseConstants.AUDIT_TRAIL_FINGERPRINT;
+import static org.bitrepository.audittrails.store.AuditDatabaseConstants.AUDIT_TRAIL_INFORMATION;
+import static org.bitrepository.audittrails.store.AuditDatabaseConstants.AUDIT_TRAIL_OPERATION;
+import static org.bitrepository.audittrails.store.AuditDatabaseConstants.AUDIT_TRAIL_OPERATION_DATE;
+import static org.bitrepository.audittrails.store.AuditDatabaseConstants.AUDIT_TRAIL_OPERATION_ID;
+import static org.bitrepository.audittrails.store.AuditDatabaseConstants.AUDIT_TRAIL_SEQUENCE_NUMBER;
+import static org.bitrepository.audittrails.store.AuditDatabaseConstants.AUDIT_TRAIL_TABLE;
 import static org.bitrepository.audittrails.store.AuditDatabaseConstants.COLLECTION_ID;
 import static org.bitrepository.audittrails.store.AuditDatabaseConstants.COLLECTION_KEY;
 import static org.bitrepository.audittrails.store.AuditDatabaseConstants.COLLECTION_TABLE;
@@ -42,278 +53,298 @@
 import static org.bitrepository.audittrails.store.AuditDatabaseConstants.CONTRIBUTOR_KEY;
 import static org.bitrepository.audittrails.store.AuditDatabaseConstants.CONTRIBUTOR_TABLE;
 import static org.bitrepository.audittrails.store.AuditDatabaseConstants.FILE_COLLECTION_KEY;
-import static org.bitrepository.audittrails.store.AuditDatabaseConstants.FILE_FILEID;
+import static org.bitrepository.audittrails.store.AuditDatabaseConstants.FILE_FILE_ID;
 import static org.bitrepository.audittrails.store.AuditDatabaseConstants.FILE_KEY;
 import static org.bitrepository.audittrails.store.AuditDatabaseConstants.FILE_TABLE;
 
-import java.sql.PreparedStatement;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.bitrepository.common.ArgumentValidator;
-import org.bitrepository.service.database.DBConnector;
-import org.bitrepository.service.database.DatabaseUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
  * Extractor for the audit trail events from the AuditTrailServiceDatabase.
- * 
+ * <p>
  * The actual extraction is delegated to the class AuditEventIterator.
- * As such any change in extraction model should be reflected in the AuditEventIterator. 
- * For futher details @see {@link org.bitrepository.audittrails.store.AuditEventIterator}
- * 
- * 
+ * As such any change in extraction model should be reflected in the AuditEventIterator.
+ * For further details @see {@link org.bitrepository.audittrails.store.AuditEventIterator}
+ * <p>
+ * <p>
  * Order of extraction:
- * FileId, ContributorId, SequenceNumber, SeqNumber, ActorName, Operation, OperationDate, 
+ * FileId, ContributorId, SequenceNumber, SeqNumber, ActorName, Operation, OperationDate,
  * AuditTrail, Information, OperationID, Certificate fingerprint
  */
 public class AuditDatabaseExtractor {
-    /** The log.*/
+    /**
+     * The log.
+     */
     private final Logger log = LoggerFactory.getLogger(getClass());
-    
-    /** Position of the FileId in the extraction.*/
+
+    /**
+     * Position of the FileId in the extraction.
+     */
     public static final int POSITION_FILE_ID = 1;
-    /** Position of the ContributorId in the extraction.*/
+    /**
+     * Position of the ContributorId in the extraction.
+     */
     public static final int POSITION_CONTRIBUTOR_ID = 2;
-    /** Position of the SequenceNumber in the extraction.*/
+    /**
+     * Position of the SequenceNumber in the extraction.
+     */
     public static final int POSITION_SEQUENCE_NUMBER = 3;
-    /** Position of the ActorName in the extraction.*/
+    /**
+     * Position of the ActorName in the extraction.
+     */
     public static final int POSITION_ACTOR_NAME = 4;
-    /** Position of the Operation in the extraction.*/
+    /**
+     * Position of the Operation in the extraction.
+     */
     public static final int POSITION_OPERATION = 5;
-    /** Position of the OperationDate in the extraction.*/
+    /**
+     * Position of the OperationDate in the extraction.
+     */
     public static final int POSITION_OPERATION_DATE = 6;
-    /** Position of the AuditTrail in the extraction.*/
+    /**
+     * Position of the AuditTrail in the extraction.
+     */
     public static final int POSITION_AUDIT_TRAIL = 7;
-    /** Position of the Information in the extraction.*/
+    /**
+     * Position of the Information in the extraction.
+     */
     public static final int POSITION_INFORMATION = 8;
-    /** Position of the OperationID in the extraction.*/
+    /**
+     * Position of the OperationID in the extraction.
+     */
     public static final int POSITION_OPERATION_ID = 9;
-    /** Position of the fingerprint in the extraction.*/
+    /**
+     * Position of the fingerprint in the extraction.
+     */
     public static final int POSITION_FINGERPRINT = 10;
-    
-    /** The model containing the elements for the restriction.*/
+
+    /**
+     * The model containing the elements for the restriction.
+     */
     private final ExtractModel model;
-    /** The connector to the database.*/
+    /**
+     * The connector to the database.
+     */
     private final DBConnector dbConnector;
-    
+
     /**
      * Constructor.
-     * @param model The model for the restriction for the extraction from the database.
+     *
+     * @param model       The model for the restriction for the extraction from the database.
      * @param dbConnector The connector to the database, where the audit trails are to be extracted.
      */
     public AuditDatabaseExtractor(ExtractModel model, DBConnector dbConnector) {
         ArgumentValidator.checkNotNull(model, "ExtractModel model");
         ArgumentValidator.checkNotNull(dbConnector, "DBConnector dbConnector");
-        
+
         this.model = model;
         this.dbConnector = dbConnector;
     }
-    
+
     /**
      * Method to extract the requested audit trails
-     * @return {@link AuditEventIterator} Iterator for extracting the Audittrails 
+     *
+     * @return {@link AuditEventIterator} Iterator for extracting the AuditTrails
      */
     public AuditEventIterator extractAuditEventsByIterator() {
-        String sql = createSelectString() + " FROM " + AUDITTRAIL_TABLE + joinWithFileTable() + joinWithActorTable() 
-                + joinWithContributorTable() + createRestriction() 
-                + " ORDER BY " + AUDITTRAIL_TABLE + "." + AUDITTRAIL_OPERATION_DATE;
+        String sql = createSelectString() + " FROM " + AUDIT_TRAIL_TABLE + joinWithFileTable() + joinWithActorTable()
+                + joinWithContributorTable() + createRestriction()
+                + " ORDER BY " + AUDIT_TRAIL_TABLE + "." + AUDIT_TRAIL_OPERATION_DATE;
         try {
-            log.debug("Creating prepared statement with sql '" + sql + "' and arguments '" 
+            log.debug("Creating prepared statement with sql '" + sql + "' and arguments '"
                     + Arrays.asList(extractArgumentsFromModel()) + " for AuditEventIterator");
-            PreparedStatement ps = DatabaseUtils.createPreparedStatement(dbConnector.getConnection(), 
+            PreparedStatement ps = DatabaseUtils.createPreparedStatement(dbConnector.getConnection(),
                     sql, extractArgumentsFromModel());
             return new AuditEventIterator(ps);
         } catch (Exception e) {
             throw new IllegalStateException("Failed to retrieve the audit trails from the database", e);
         }
     }
-    
+
     /**
-     * NOTE: This is where the position of the constants come into play. 
-     * E.g. POSITION_FILE_GUID = 1 refers to the first extracted element being the AUDITTRAIL_FILE_GUID.
+     * NOTE: This is where the position of the constants come into play.
+     * E.g. POSITION_FILE_GUID = 1 refers to the first extracted element being the AUDIT_TRAIL_FILE_GUID.
+     *
      * @return Creates the SELECT string for the retrieval of the audit events.
      */
     private String createSelectString() {
         StringBuilder res = new StringBuilder();
-        
+
         res.append("SELECT ");
-        res.append(FILE_TABLE + "." + FILE_FILEID + ", ");
+        res.append(FILE_TABLE + "." + FILE_FILE_ID + ", ");
         res.append(CONTRIBUTOR_TABLE + "." + CONTRIBUTOR_ID + ", ");
-        res.append(AUDITTRAIL_TABLE + "." + AUDITTRAIL_SEQUENCE_NUMBER + ", ");
+        res.append(AUDIT_TRAIL_TABLE + "." + AUDIT_TRAIL_SEQUENCE_NUMBER + ", ");
         res.append(ACTOR_TABLE + "." + ACTOR_NAME + ", ");
-        res.append(AUDITTRAIL_TABLE + "." + AUDITTRAIL_OPERATION + ", ");
-        res.append(AUDITTRAIL_TABLE + "." + AUDITTRAIL_OPERATION_DATE + ", ");
-        res.append(AUDITTRAIL_TABLE + "." + AUDITTRAIL_AUDIT + ", ");
-        res.append(AUDITTRAIL_TABLE + "." + AUDITTRAIL_INFORMATION + ", ");
-        res.append(AUDITTRAIL_TABLE + "." + AUDITTRAIL_OPERATION_ID + ", ");
-        res.append(AUDITTRAIL_TABLE + "." + AUDITTRAIL_FINGERPRINT + " ");
-        
+        res.append(AUDIT_TRAIL_TABLE + "." + AUDIT_TRAIL_OPERATION + ", ");
+        res.append(AUDIT_TRAIL_TABLE + "." + AUDIT_TRAIL_OPERATION_DATE + ", ");
+        res.append(AUDIT_TRAIL_TABLE + "." + AUDIT_TRAIL_AUDIT + ", ");
+        res.append(AUDIT_TRAIL_TABLE + "." + AUDIT_TRAIL_INFORMATION + ", ");
+        res.append(AUDIT_TRAIL_TABLE + "." + AUDIT_TRAIL_OPERATION_ID + ", ");
+        res.append(AUDIT_TRAIL_TABLE + "." + AUDIT_TRAIL_FINGERPRINT + " ");
+
         return res.toString();
     }
-    
+
     /**
      * Joining the AuditTrail table with the File table.
-     * 
+     *
      * @return The sql for joining the tables.
      */
     private String joinWithFileTable() {
-        return " JOIN " + FILE_TABLE + " ON " + AUDITTRAIL_TABLE + "." + AUDITTRAIL_FILE_KEY + " = " + FILE_TABLE + "."
-                + FILE_KEY + " "; 
+        return " JOIN " + FILE_TABLE + " ON " + AUDIT_TRAIL_TABLE + "." + AUDIT_TRAIL_FILE_KEY + " = " + FILE_TABLE + "."
+                + FILE_KEY + " ";
     }
 
     /**
      * Joining the AuditTrail table with the Actor table.
-     * 
+     *
      * @return The sql for joining the tables.
      */
     private String joinWithActorTable() {
-        return " JOIN " + ACTOR_TABLE + " ON " + AUDITTRAIL_TABLE + "." + AUDITTRAIL_ACTOR_KEY + " = " + ACTOR_TABLE 
-                + "." + ACTOR_KEY + " "; 
+        return " JOIN " + ACTOR_TABLE + " ON " + AUDIT_TRAIL_TABLE + "." + AUDIT_TRAIL_ACTOR_KEY + " = " + ACTOR_TABLE
+                + "." + ACTOR_KEY + " ";
     }
-    
+
     /**
      * Joining the AuditTrail table with the Contributor table.
-     * 
+     *
      * @return The sql for joining the tables.
      */
     private String joinWithContributorTable() {
-        return " JOIN " + CONTRIBUTOR_TABLE + " ON " + AUDITTRAIL_TABLE + "." + AUDITTRAIL_CONTRIBUTOR_KEY + " = " 
-                + CONTRIBUTOR_TABLE + "." + CONTRIBUTOR_KEY + " "; 
+        return " JOIN " + CONTRIBUTOR_TABLE + " ON " + AUDIT_TRAIL_TABLE + "." + AUDIT_TRAIL_CONTRIBUTOR_KEY + " = "
+                + CONTRIBUTOR_TABLE + "." + CONTRIBUTOR_KEY + " ";
     }
-    
+
     /**
      * Create the restriction part of the SQL statement for extracting the requested data from the database.
+     *
      * @return The restriction, or empty string if no restrictions.
      */
     private String createRestriction() {
         StringBuilder res = new StringBuilder();
-        
-        if(model.getFileId() != null) {
+
+        if (model.getFileId() != null) {
             nextArgument(res);
-            res.append(FILE_TABLE + "."+ FILE_FILEID + " = ? ");
+            res.append(FILE_TABLE + "." + FILE_FILE_ID + " = ? ");
         }
 
-        if(model.getCollectionId() != null) {
+        if (model.getCollectionId() != null) {
             nextArgument(res);
-            res.append(FILE_TABLE + "." + FILE_COLLECTION_KEY + " = ( SELECT " + COLLECTION_KEY + " FROM " 
+            res.append(FILE_TABLE + "." + FILE_COLLECTION_KEY + " = ( SELECT " + COLLECTION_KEY + " FROM "
                     + COLLECTION_TABLE + " WHERE " + COLLECTION_ID + " = ? )");
         }
-        
-        if(model.getContributorId() != null) {
+
+        if (model.getContributorId() != null) {
             nextArgument(res);
-            res.append(AUDITTRAIL_TABLE + "." + AUDITTRAIL_CONTRIBUTOR_KEY + " = ( SELECT " + CONTRIBUTOR_KEY 
+            res.append(AUDIT_TRAIL_TABLE + "." + AUDIT_TRAIL_CONTRIBUTOR_KEY + " = ( SELECT " + CONTRIBUTOR_KEY
                     + " FROM " + CONTRIBUTOR_TABLE + " WHERE " + CONTRIBUTOR_ID + " = ? )");
         }
-        
-        if(model.getMinSeqNumber() != null) {
+
+        if (model.getMinSeqNumber() != null) {
             nextArgument(res);
-            res.append(AUDITTRAIL_TABLE + "." + AUDITTRAIL_SEQUENCE_NUMBER + " >= ?");
+            res.append(AUDIT_TRAIL_TABLE + "." + AUDIT_TRAIL_SEQUENCE_NUMBER + " >= ?");
         }
-        
-        if(model.getMaxSeqNumber() != null) {
+
+        if (model.getMaxSeqNumber() != null) {
             nextArgument(res);
-            res.append(AUDITTRAIL_TABLE + "." + AUDITTRAIL_SEQUENCE_NUMBER + " <= ?");
+            res.append(AUDIT_TRAIL_TABLE + "." + AUDIT_TRAIL_SEQUENCE_NUMBER + " <= ?");
         }
-        
-        if(model.getActorName() != null) {
+
+        if (model.getActorName() != null) {
             nextArgument(res);
-            res.append(AUDITTRAIL_TABLE + "." + AUDITTRAIL_ACTOR_KEY + " = ( SELECT " + ACTOR_KEY + " FROM " 
+            res.append(AUDIT_TRAIL_TABLE + "." + AUDIT_TRAIL_ACTOR_KEY + " = ( SELECT " + ACTOR_KEY + " FROM "
                     + ACTOR_TABLE + " WHERE " + ACTOR_NAME + " = ? )");
         }
-        
-        if(model.getOperation() != null) {
+
+        if (model.getOperation() != null) {
             nextArgument(res);
-            res.append(AUDITTRAIL_TABLE + "." + AUDITTRAIL_OPERATION + " = ?");
+            res.append(AUDIT_TRAIL_TABLE + "." + AUDIT_TRAIL_OPERATION + " = ?");
         }
-        
-        if(model.getStartDate() != null) {
+
+        if (model.getStartDate() != null) {
             nextArgument(res);
-            res.append(AUDITTRAIL_TABLE + "." + AUDITTRAIL_OPERATION_DATE + " >= ?");
+            res.append(AUDIT_TRAIL_TABLE + "." + AUDIT_TRAIL_OPERATION_DATE + " >= ?");
         }
-        
-        if(model.getEndDate() != null) {
+
+        if (model.getEndDate() != null) {
             nextArgument(res);
-            res.append(AUDITTRAIL_TABLE + "." + AUDITTRAIL_OPERATION_DATE + " <= ?");
+            res.append(AUDIT_TRAIL_TABLE + "." + AUDIT_TRAIL_OPERATION_DATE + " <= ?");
         }
-        
-        if(model.getFingerprint() != null) {
+
+        if (model.getFingerprint() != null) {
             nextArgument(res);
-            res.append(AUDITTRAIL_TABLE + "." + AUDITTRAIL_FINGERPRINT + " = ?");
+            res.append(AUDIT_TRAIL_TABLE + "." + AUDIT_TRAIL_FINGERPRINT + " = ?");
         }
-        
-        if(model.getOperationID() != null) {
+
+        if (model.getOperationID() != null) {
             nextArgument(res);
-            res.append(AUDITTRAIL_TABLE + "." + AUDITTRAIL_OPERATION_ID + " = ?");
+            res.append(AUDIT_TRAIL_TABLE + "." + AUDIT_TRAIL_OPERATION_ID + " = ?");
         }
-        
+
         return res.toString();
     }
-    
+
     /**
      * Adds either ' AND ' or 'WHERE ' depending on whether it is the first restriction.
+     *
      * @param res The StringBuilder where the restrictions are combined.
      */
     private void nextArgument(StringBuilder res) {
-        if(res.length() > 0) {
+        if (res.length() > 0) {
             res.append(" AND ");
         } else {
             res.append(" WHERE ");
-        }            
+        }
     }
-    
+
     /**
      * @return The list of elements in the model which are not null.
      */
     private Object[] extractArgumentsFromModel() {
         List<Object> res = new ArrayList<>();
-        
-        if(model.getFileId() != null) {
+
+        if (model.getFileId() != null) {
             res.add(model.getFileId());
         }
-        
-        if(model.getCollectionId() != null) {
+
+        if (model.getCollectionId() != null) {
             res.add(model.getCollectionId());
         }
-        
-        if(model.getContributorId() != null) {
+
+        if (model.getContributorId() != null) {
             res.add(model.getContributorId());
         }
-        
-        if(model.getMinSeqNumber() != null) {
+
+        if (model.getMinSeqNumber() != null) {
             res.add(model.getMinSeqNumber());
         }
-        
-        if(model.getMaxSeqNumber() != null) {
+
+        if (model.getMaxSeqNumber() != null) {
             res.add(model.getMaxSeqNumber());
         }
-        
-        if(model.getActorName() != null) {
+
+        if (model.getActorName() != null) {
             res.add(model.getActorName());
         }
-        
-        if(model.getOperation() != null) {
+
+        if (model.getOperation() != null) {
             res.add(model.getOperation().toString());
         }
-        
-        if(model.getStartDate() != null) {
+
+        if (model.getStartDate() != null) {
             res.add(model.getStartDate().getTime());
         }
-        
-        if(model.getEndDate() != null) {
+
+        if (model.getEndDate() != null) {
             res.add(model.getEndDate().getTime());
         }
-        
-        if(model.getFingerprint() != null) {
+
+        if (model.getFingerprint() != null) {
             res.add(model.getFingerprint());
         }
-        
-        if(model.getOperationID() != null) {
+
+        if (model.getOperationID() != null) {
             res.add(model.getOperationID());
         }
-        
+
         return res.toArray();
     }
 }
diff --git a/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/store/AuditEventIterator.java b/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/store/AuditEventIterator.java
index e6a9e2bb0..71de265db 100644
--- a/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/store/AuditEventIterator.java
+++ b/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/store/AuditEventIterator.java
@@ -8,12 +8,12 @@
  * it under the terms of the GNU Lesser General Public License as
  * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
@@ -21,18 +21,18 @@
  */
 package org.bitrepository.audittrails.store;
 
-import java.math.BigInteger;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
 import org.bitrepository.bitrepositoryelements.AuditTrailEvent;
 import org.bitrepository.bitrepositoryelements.FileAction;
 import org.bitrepository.common.utils.CalendarUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.math.BigInteger;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
 import static org.bitrepository.audittrails.store.AuditDatabaseExtractor.POSITION_ACTOR_NAME;
 import static org.bitrepository.audittrails.store.AuditDatabaseExtractor.POSITION_AUDIT_TRAIL;
 import static org.bitrepository.audittrails.store.AuditDatabaseExtractor.POSITION_CONTRIBUTOR_ID;
@@ -46,61 +46,61 @@
 
 
 /**
- * Class to iterate over the set of AuditTrailEvents produced by a resultset.  
+ * Class to iterate over the set of AuditTrailEvents produced by a ResultSet.
  */
 public class AuditEventIterator {
-
-    /** The log.*/
     private final Logger log = LoggerFactory.getLogger(getClass());
     private ResultSet auditResultSet = null;
     private Connection conn = null;
     private final PreparedStatement ps;
-    
+
     /**
      * @param ps The prepare statement to execute and iterate over.
      */
     public AuditEventIterator(PreparedStatement ps) {
         this.ps = ps;
     }
-    
+
     /**
-     * Method to explicitly close the ResultSet in the AuditEventIterator 
+     * Method to explicitly close the ResultSet in the AuditEventIterator
+     *
      * @throws SQLException in case of a sql error
      */
     public void close() throws SQLException {
-        if(auditResultSet != null) {
+        if (auditResultSet != null) {
             auditResultSet.close();
         }
-        
-        if(ps != null) {
+
+        if (ps != null) {
             ps.close();
         }
-        
-        if(conn != null) {
+
+        if (conn != null) {
             conn.setAutoCommit(true);
             conn.close();
             conn = null;
         }
     }
-    
+
     /**
      * Method to return the next AuditTrailEvent in the ResultSet
-     * When no more AuditTrailEvents are available, null is returned and the internal ResultSet closed. 
-     * @return The next AuditTrailEvent available in the ResultSet, or null if no more events are available. 
+     * When no more AuditTrailEvents are available, null is returned and the internal ResultSet closed.
+     *
+     * @return The next AuditTrailEvent available in the ResultSet, or null if no more events are available.
      */
     public AuditTrailEvent getNextAuditTrailEvent() {
         try {
             AuditTrailEvent event = null;
-            if(auditResultSet == null) {
+            if (auditResultSet == null) {
                 conn = ps.getConnection();
                 conn.setAutoCommit(false);
                 ps.setFetchSize(100);
                 long tStart = System.currentTimeMillis();
-                log.debug("Executing query to get AuditTrailEvents resultset");
+                log.debug("Executing query to get AuditTrailEvents ResultSet");
                 auditResultSet = ps.executeQuery();
                 log.debug("Finished executing AuditTrailEvents query, it took: " + (System.currentTimeMillis() - tStart) + "ms");
             }
-            if(auditResultSet.next()) {
+            if (auditResultSet.next()) {
                 event = new AuditTrailEvent();
                 event.setActionDateTime(CalendarUtils.getFromMillis(auditResultSet.getLong(POSITION_OPERATION_DATE)));
                 event.setActionOnFile(FileAction.fromValue(auditResultSet.getString(POSITION_OPERATION)));
@@ -115,7 +115,7 @@ public AuditTrailEvent getNextAuditTrailEvent() {
             } else {
                 close();
             }
-    
+
             return event;
         } catch (Exception e) {
             try {
@@ -123,8 +123,8 @@ public AuditTrailEvent getNextAuditTrailEvent() {
             } catch (SQLException e1) {
                 throw new RuntimeException("Failed to close ResultSet or PreparedStatement", e1);
             }
-            throw new IllegalStateException("Could not extract the wanted audittrails", e);
-        } 
+            throw new IllegalStateException("Could not extract the wanted AuditTrails", e);
+        }
     }
 
 }
diff --git a/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/store/AuditTrailAdder.java b/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/store/AuditTrailAdder.java
index e3a671711..8debe7e02 100644
--- a/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/store/AuditTrailAdder.java
+++ b/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/store/AuditTrailAdder.java
@@ -8,12 +8,12 @@
  * it under the terms of the GNU Lesser General Public License as
  * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
@@ -21,10 +21,6 @@
  */
 package org.bitrepository.audittrails.store;
 
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-
 import org.bitrepository.bitrepositoryelements.AuditTrailEvent;
 import org.bitrepository.bitrepositoryelements.AuditTrailEvents;
 import org.bitrepository.common.utils.CalendarUtils;
@@ -32,95 +28,99 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+
 public class AuditTrailAdder {
 
     /**
      * SQL for conditionally adding an collectionID to the database.
-     * Only adds the collectionID if it does not exist. 
+     * Only adds the collectionID if it does not exist.
      */
     private final String addCollectionIDSql = "INSERT INTO collection ( collectionid )"
-            + " ( SELECT ? FROM collection" 
+            + " ( SELECT ? FROM collection"
             + " WHERE collectionid = ?"
             + " HAVING count(*) = 0 )";
-    
+
     /**
      * SQL for conditionally adding an actor to the database
      * Only adds an actor if it does not already exist.
      */
     private final String addActorSql = "INSERT INTO actor ( actor_name )"
-            + " ( SELECT ? FROM actor" 
+            + " ( SELECT ? FROM actor"
             + " WHERE actor_name = ?"
             + " HAVING count(*) = 0 )";
-    
+
     /**
      * SQL for conditionally adding a contributor to the database
-     * Only adds the contributor if it does not already exist. 
+     * Only adds the contributor if it does not already exist.
      */
     private final String addContributorSql = "INSERT INTO contributor ( contributor_id )"
-            + " ( SELECT ? FROM contributor" 
+            + " ( SELECT ? FROM contributor"
             + " WHERE contributor_id = ?"
             + " HAVING count(*) = 0 )";
-    
+
     /**
-     * SQL for conditionally adding a fileID to the database. 
-     * Only adds the file if it does not already exist. 
+     * SQL for conditionally adding a fileID to the database.
+     * Only adds the file if it does not already exist.
      */
     private final String addFileIDSql = "INSERT INTO file ( fileid, collection_key )"
             + " ( SELECT ?, ("
-                + " SELECT collection_key" 
-                + " FROM collection" 
-                + " WHERE collectionid = ?)"
+            + " SELECT collection_key"
+            + " FROM collection"
+            + " WHERE collectionid = ?)"
             + " FROM file"
-            + " JOIN collection" 
+            + " JOIN collection"
             + " ON file.collection_key = collection.collection_key"
             + " WHERE collectionid = ?"
             + " AND fileid = ?"
             + " HAVING count(*) = 0 )";
-    
+
     /**
-     * Sql for adding audit trail an audit trail event 
+     * Sql for adding audit trail an audit trail event
      */
-    private final String addAuditTrailSql = "INSERT INTO audittrail" 
+    private final String addAuditTrailSql = "INSERT INTO audittrail"
             + " ( sequence_number, "
-            + "contributor_key, " 
-            + "file_key, " 
-            + "actor_key, " 
-            + "operation, " 
-            + "operation_date, " 
-            + "audit, " 
-            + "information, " 
-            + "operationID, " 
+            + "contributor_key, "
+            + "file_key, "
+            + "actor_key, "
+            + "operation, "
+            + "operation_date, "
+            + "audit, "
+            + "information, "
+            + "operationID, "
             + "fingerprint)"
-            + " VALUES ( ?," 
-                + " (SELECT contributor_key FROM contributor"
-                + " WHERE contributor_id = ?),"
-                + " (SELECT file_key FROM file"
-                + " JOIN collection" 
-                + " ON file.collection_key = collection.collection_key"  
-                + " WHERE collectionid = ?" 
-                + " AND fileid = ?),"
-                + " (SELECT actor_key FROM actor"
-                + " WHERE actor_name = ?)," 
-                + " ?, ?, ?, ?, ?, ? )";
-    
+            + " VALUES ( ?,"
+            + " (SELECT contributor_key FROM contributor"
+            + " WHERE contributor_id = ?),"
+            + " (SELECT file_key FROM file"
+            + " JOIN collection"
+            + " ON file.collection_key = collection.collection_key"
+            + " WHERE collectionid = ?"
+            + " AND fileid = ?),"
+            + " (SELECT actor_key FROM actor"
+            + " WHERE actor_name = ?),"
+            + " ?, ?, ?, ?, ?, ? )";
+
     private final String addLatestSequencesSql = "INSERT INTO collection_progress "
             + "(collectionID, contributorID, latest_sequence_number)"
             + " ( SELECT collectionID, ?, ? FROM collection"
-                + " WHERE collectionID = ?"
-                + " AND NOT EXISTS ( SELECT * FROM collection_progress"
-                    + " WHERE collectionID = ?"
-                    + " AND contributorID = ?))";
+            + " WHERE collectionID = ?"
+            + " AND NOT EXISTS ( SELECT * FROM collection_progress"
+            + " WHERE collectionID = ?"
+            + " AND contributorID = ?))";
 
     private final String updateLatestSequenceSql = "UPDATE collection_progress"
             + " SET latest_sequence_number = ? "
             + " WHERE collectionID = ?"
             + " AND contributorID = ?";
-    
-    private Logger log = LoggerFactory.getLogger(getClass());
-    
+
+    private final Logger log = LoggerFactory.getLogger(getClass());
+
     private final String collectionID;
     private final String contributorID;
-    
+
     private final Connection conn;
     private PreparedStatement addCollectionIDPs;
     private PreparedStatement addActorNamePs;
@@ -129,13 +129,13 @@ public class AuditTrailAdder {
     private PreparedStatement addAuditTrailPs;
     private PreparedStatement addLatestSeqPs;
     private PreparedStatement updateLatestSeqPs;
-    
+
     public AuditTrailAdder(DBConnector connector, String collectionID, String contributorID) {
         this.conn = connector.getConnection();
         this.collectionID = collectionID;
         this.contributorID = contributorID;
     }
-    
+
     private void init() throws SQLException {
         conn.setAutoCommit(false);
         addCollectionIDPs = conn.prepareStatement(addCollectionIDSql);
@@ -146,19 +146,20 @@ private void init() throws SQLException {
         updateLatestSeqPs = conn.prepareStatement(updateLatestSequenceSql);
         addLatestSeqPs = conn.prepareStatement(addLatestSequencesSql);
     }
-    
+
     /**
      * Method to handle the actual addition of audit trails
+     *
      * @param events the audit trail events
      */
     public void addAuditTrails(AuditTrailEvents events) {
         try {
             init();
             log.debug("Initialized AuditTrailAdder");
-            Long latestSeq = 0L;
+            long latestSeq = 0L;
             addCollectionID(collectionID);
             addContributor(contributorID);
-            for(AuditTrailEvent event : events.getAuditTrailEvent()) {
+            for (AuditTrailEvent event : events.getAuditTrailEvent()) {
                 addActor(event);
                 addFileID(event);
                 addAuditTrail(event);
@@ -176,31 +177,31 @@ public void addAuditTrails(AuditTrailEvents events) {
             close();
         }
     }
-    
+
     private void addCollectionID(String collectionID) throws SQLException {
         addCollectionIDPs.setString(1, collectionID);
         addCollectionIDPs.setString(2, collectionID);
     }
-    
+
     private void addActor(AuditTrailEvent event) throws SQLException {
         addActorNamePs.setString(1, event.getActorOnFile());
         addActorNamePs.setString(2, event.getActorOnFile());
         addActorNamePs.addBatch();
     }
-    
+
     private void addContributor(String contributor) throws SQLException {
         addContributorIDPs.setString(1, contributor);
         addContributorIDPs.setString(2, contributor);
     }
-    
+
     private void addFileID(AuditTrailEvent event) throws SQLException {
         addFileIDPs.setString(1, event.getFileID());
         addFileIDPs.setString(2, collectionID);
         addFileIDPs.setString(3, collectionID);
         addFileIDPs.setString(4, event.getFileID());
-        addFileIDPs.addBatch();       
+        addFileIDPs.addBatch();
     }
-    
+
     private void addAuditTrail(AuditTrailEvent event) throws SQLException {
         addAuditTrailPs.setLong(1, event.getSequenceNumber().longValue());
         addAuditTrailPs.setString(2, event.getReportingComponent());
@@ -215,19 +216,19 @@ private void addAuditTrail(AuditTrailEvent event) throws SQLException {
         addAuditTrailPs.setString(11, event.getCertificateID());
         addAuditTrailPs.addBatch();
     }
-    
+
     private void updateMaxSeq(Long seq) throws SQLException {
         updateLatestSeqPs.setLong(1, seq);
         updateLatestSeqPs.setString(2, collectionID);
         updateLatestSeqPs.setString(3, contributorID);
-        
+
         addLatestSeqPs.setString(1, contributorID);
         addLatestSeqPs.setLong(2, seq);
         addLatestSeqPs.setString(3, collectionID);
         addLatestSeqPs.setString(4, collectionID);
         addLatestSeqPs.setString(5, contributorID);
     }
-    
+
     private void execute() throws SQLException {
         try {
             addCollectionIDPs.execute();
@@ -243,36 +244,36 @@ private void execute() throws SQLException {
             throw new SQLException("Rolled back transaction due to failure", e);
         }
     }
-    
+
     private void close() {
         try {
-            if(addCollectionIDPs != null) {
+            if (addCollectionIDPs != null) {
                 addCollectionIDPs.close();
             }
-            if(addActorNamePs != null) {
+            if (addActorNamePs != null) {
                 addActorNamePs.close();
             }
-            if(addContributorIDPs != null) {
+            if (addContributorIDPs != null) {
                 addContributorIDPs.close();
             }
-            if(addFileIDPs != null) {
+            if (addFileIDPs != null) {
                 addFileIDPs.close();
             }
-            if(addAuditTrailPs != null) {
+            if (addAuditTrailPs != null) {
                 addAuditTrailPs.close();
             }
-            if(updateLatestSeqPs != null) {
+            if (updateLatestSeqPs != null) {
                 updateLatestSeqPs.close();
             }
-            if(addLatestSeqPs != null) {
+            if (addLatestSeqPs != null) {
                 addLatestSeqPs.close();
             }
-            if(conn != null) {
+            if (conn != null) {
                 conn.setAutoCommit(true);
                 conn.close();
             }
         } catch (SQLException e) {
-            throw new IllegalStateException("Failed clean up prepared statements and/or dbconnection.", e);
+            throw new IllegalStateException("Failed clean up prepared statements and/or database connection.", e);
         }
     }
 }
diff --git a/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/store/AuditTrailDatabaseCreator.java b/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/store/AuditTrailDatabaseCreator.java
index a69ba321e..0c3b8687b 100644
--- a/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/store/AuditTrailDatabaseCreator.java
+++ b/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/store/AuditTrailDatabaseCreator.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -36,11 +36,11 @@ public class AuditTrailDatabaseCreator extends DatabaseCreator {
 
     /**
      * @param args <ol>
-     * <li> The path to the directory containing the settings. See
-     * {@link org.bitrepository.common.settings.XMLFileSettingsLoader} for details.</li>
-     * <li> The database creation script as found in the classpath. Will revert to DEFAULT_AUDIT_TRAIL_DB_SCRIPT =
-     * "sql/derby/checksumDBCreation.sql" if null.</li>
-     * </ol>
+     *             <li> The path to the directory containing the settings. See
+     *             {@link org.bitrepository.common.settings.XMLFileSettingsLoader} for details.</li>
+     *             <li> The database creation script as found in the classpath. Will revert to DEFAULT_AUDIT_TRAIL_DB_SCRIPT =
+     *             "sql/derby/checksumDBCreation.sql" if null.</li>
+     *             </ol>
      */
     public static void main(String[] args) {
         AuditTrailDatabaseCreator dbCreator = new AuditTrailDatabaseCreator();
diff --git a/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/store/AuditTrailDatabaseManager.java b/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/store/AuditTrailDatabaseManager.java
index 51ab8f23c..42a2bd220 100644
--- a/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/store/AuditTrailDatabaseManager.java
+++ b/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/store/AuditTrailDatabaseManager.java
@@ -8,12 +8,12 @@
  * it under the terms of the GNU Lesser General Public License as
  * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
@@ -26,17 +26,17 @@
 import org.bitrepository.settings.referencesettings.DatabaseSpecifics;
 
 /**
- * Manager for the database of the AuditTrailService. For usage, see @DatabaseManager. 
+ * Manager for the database of the AuditTrailService. For usage, see @DatabaseManager.
  */
 public class AuditTrailDatabaseManager extends DatabaseManager {
 
     private final DatabaseSpecifics databaseSpecifics;
     private DatabaseMigrator migrator = null;
-    
+
     public AuditTrailDatabaseManager(DatabaseSpecifics databaseSpecifics) {
         this.databaseSpecifics = databaseSpecifics;
     }
-    
+
     @Override
     protected DatabaseSpecifics getDatabaseSpecifics() {
         return databaseSpecifics;
@@ -44,7 +44,7 @@ protected DatabaseSpecifics getDatabaseSpecifics() {
 
     @Override
     protected synchronized DatabaseMigrator getMigrator() {
-        if(migrator == null) {
+        if (migrator == null) {
             migrator = new AuditTrailServiceDatabaseMigrator(connector);
         }
         return migrator;
@@ -52,7 +52,7 @@ protected synchronized DatabaseMigrator getMigrator() {
 
     @Override
     protected boolean needsMigration() {
-        return getMigrator().needsMigration(); 
+        return getMigrator().needsMigration();
     }
 
     @Override
diff --git a/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/store/AuditTrailServiceDAO.java b/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/store/AuditTrailServiceDAO.java
index 90cb81379..5c8c3f9f6 100644
--- a/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/store/AuditTrailServiceDAO.java
+++ b/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/store/AuditTrailServiceDAO.java
@@ -5,26 +5,22 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.audittrails.store;
 
-import java.sql.SQLException;
-import java.util.Date;
-import java.util.List;
-
 import org.bitrepository.bitrepositoryelements.AuditTrailEvents;
 import org.bitrepository.bitrepositoryelements.FileAction;
 import org.bitrepository.common.ArgumentValidator;
@@ -34,27 +30,29 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.sql.SQLException;
+import java.util.Date;
+import java.util.List;
+
 /**
  * Audit trail storages backed by a database for preserving
  */
 public class AuditTrailServiceDAO implements AuditTrailStore {
-    /** The log.*/
-    private Logger log = LoggerFactory.getLogger(getClass());
-    /** The connection to the database.*/
-    private DBConnector dbConnector;
-    
-    /** 
-     * Constructor.
+    private final Logger log = LoggerFactory.getLogger(getClass());
+    private final DBConnector dbConnector;
+
+    /**
      * @param databaseManager The database manager
      */
     public AuditTrailServiceDAO(DatabaseManager databaseManager) {
         dbConnector = databaseManager.getConnector();
     }
-    
+
     @Override
     public AuditEventIterator getAuditTrailsByIterator(String fileID, String collectionID, String contributorId,
-            Long minSeqNumber, Long maxSeqNumber, String actorName, FileAction operation, Date startDate, 
-            Date endDate, String fingerprint, String operationID) {
+                                                       Long minSeqNumber, Long maxSeqNumber, String actorName, FileAction operation,
+                                                       Date startDate,
+                                                       Date endDate, String fingerprint, String operationID) {
         ExtractModel model = new ExtractModel();
         model.setFileId(fileID);
         model.setCollectionId(collectionID);
@@ -71,52 +69,52 @@ public AuditEventIterator getAuditTrailsByIterator(String fileID, String collect
         AuditDatabaseExtractor extractor = new AuditDatabaseExtractor(model, dbConnector);
         return extractor.extractAuditEventsByIterator();
     }
-    
+
     @Override
     public void addAuditTrails(AuditTrailEvents auditTrailEvents, String collectionID, String contributorID) {
         ArgumentValidator.checkNotNull(auditTrailEvents, "AuditTrailEvents auditTrailEvents");
         ArgumentValidator.checkNotNullOrEmpty(collectionID, "String collectionID");
         ArgumentValidator.checkNotNullOrEmpty(contributorID, "String contributorID");
-        
+
         AuditTrailAdder adder = new AuditTrailAdder(dbConnector, collectionID, contributorID);
         adder.addAuditTrails(auditTrailEvents);
     }
-    
+
     @Override
     public List<String> getKnownContributors() {
         String sql = "SELECT contributor_id FROM contributor";
-        return DatabaseUtils.selectStringList(dbConnector, sql, new Object[0]);
+        return DatabaseUtils.selectStringList(dbConnector, sql);
     }
-    
+
     @Override
     public long largestSequenceNumber(String contributorID, String collectionID) {
         ArgumentValidator.checkNotNullOrEmpty(contributorID, "String contributorId");
         ArgumentValidator.checkNotNullOrEmpty(collectionID, "String collectionID");
-        
+
         String sql = "SELECT latest_sequence_number FROM collection_progress"
                 + " WHERE collectionID = ?"
                 + " AND contributorID = ?";
-        
+
         Long seq = DatabaseUtils.selectFirstLongValue(dbConnector, sql, collectionID, contributorID);
         log.debug("Looked up latest seq number for {} in collection '{}', it was: {}", contributorID, collectionID, seq);
-        return (seq != null ? seq.longValue() : 0L);
+        return (seq != null ? seq : 0L);
     }
 
     @Override
     public long getPreservationSequenceNumber(String contributorId, String collectionID) {
         ArgumentValidator.checkNotNullOrEmpty(contributorId, "String contributorId");
         ArgumentValidator.checkNotNullOrEmpty(collectionID, "String collectionID");
-        
-        String sql = "SELECT preserved_seq_number FROM preservation" 
-                + " WHERE contributor_key = (" 
-                    + " SELECT contributor_key FROM contributor" 
-                    + " WHERE contributor_id = ? )"
-                + "AND collection_key = (" 
-                    + " SELECT collection_key FROM collection" 
-                    + " WHERE collectionid = ? )";
-        
+
+        String sql = "SELECT preserved_seq_number FROM preservation"
+                + " WHERE contributor_key = ("
+                + " SELECT contributor_key FROM contributor"
+                + " WHERE contributor_id = ? )"
+                + "AND collection_key = ("
+                + " SELECT collection_key FROM collection"
+                + " WHERE collectionid = ? )";
+
         Long seq = DatabaseUtils.selectLongValue(dbConnector, sql, contributorId, collectionID);
-        if(seq != null) {
+        if (seq != null) {
             return seq.intValue();
         }
         return 0;
@@ -127,70 +125,66 @@ public void setPreservationSequenceNumber(String contributorId, String collectio
         ArgumentValidator.checkNotNullOrEmpty(contributorId, "String contributorId");
         ArgumentValidator.checkNotNegative(seqNumber, "int seqNumber");
         long preservationKey = retrievePreservationKey(contributorId, collectionID);
-        log.debug("Updating preservation sequence number for contributor: " + contributorId 
+        log.debug("Updating preservation sequence number for contributor: " + contributorId
                 + " in collection: " + collectionID + " to seq: " + seqNumber);
-        
+
         String sqlUpdate = "UPDATE preservation SET preserved_seq_number = ?"
                 + " WHERE preservation_key = ?";
         DatabaseUtils.executeStatement(dbConnector, sqlUpdate, seqNumber, preservationKey);
     }
-    
+
     @Override
     public boolean havePreservationKey(String contributorID, String collectionID) {
-        String sql = "SELECT preservation_key FROM preservation" 
-                + " WHERE contributor_key = (" 
-                    + " SELECT contributor_key FROM contributor" 
-                    + " WHERE contributor_id = ? ) "
+        String sql = "SELECT preservation_key FROM preservation"
+                + " WHERE contributor_key = ("
+                + " SELECT contributor_key FROM contributor"
+                + " WHERE contributor_id = ? ) "
                 + "AND collection_key = ("
-                    + " SELECT collection_key FROM collection"
-                    + " WHERE collectionid = ? )";
-        
+                + " SELECT collection_key FROM collection"
+                + " WHERE collectionid = ? )";
+
         Long preservationKey = DatabaseUtils.selectLongValue(dbConnector, sql, contributorID, collectionID);
-        if(preservationKey == null) {
-            return false;    
-        } else {
-            return true;
-        }   
+        return preservationKey != null;
     }
-    
+
     /**
      * Retrieves the key of the preservation table entry for the given collection and contributor.
-     * 
+     *
      * @param contributorId The contributor of the preservation table entry.
-     * @param collectionID The collection of the preservation table entry.
+     * @param collectionID  The collection of the preservation table entry.
      * @return The key of the entry in the preservation table.
      */
     private Long retrievePreservationKey(String contributorId, String collectionID) {
-        String sqlRetrieve = "SELECT preservation_key FROM preservation" 
-                + " WHERE contributor_key = (" 
-                    + " SELECT contributor_key FROM contributor" 
-                    + " WHERE contributor_id = ? )"
+        String sqlRetrieve = "SELECT preservation_key FROM preservation"
+                + " WHERE contributor_key = ("
+                + " SELECT contributor_key FROM contributor"
+                + " WHERE contributor_id = ? )"
                 + " AND collection_key = ("
-                    + " SELECT collection_key FROM collection"
-                    + " WHERE collectionid = ? )";
+                + " SELECT collection_key FROM collection"
+                + " WHERE collectionid = ? )";
         Long guid = DatabaseUtils.selectLongValue(dbConnector, sqlRetrieve, contributorId, collectionID);
-        
-        if(guid == null) {
-            log.debug("Inserting preservation entry for contributor '" + contributorId + "' and collection '" 
+
+        if (guid == null) {
+            log.debug("Inserting preservation entry for contributor '" + contributorId + "' and collection '"
                     + collectionID + "' into the preservation table.");
             String sqlInsert = "INSERT INTO preservation ( contributor_key, collection_key)"
                     + " VALUES ( "
-                        + "(SELECT contributor_key FROM contributor"
-                        + " WHERE contributor_id = ?)"
+                    + "(SELECT contributor_key FROM contributor"
+                    + " WHERE contributor_id = ?)"
                     + ", "
-                        + "( SELECT collection_key FROM collection"
-                        + " WHERE collectionid" + " = ? )"
+                    + "( SELECT collection_key FROM collection"
+                    + " WHERE collectionid" + " = ? )"
                     + ")";
             DatabaseUtils.executeStatement(dbConnector, sqlInsert, contributorId, collectionID);
-            
+
             guid = DatabaseUtils.selectLongValue(dbConnector, sqlRetrieve, contributorId, collectionID);
         }
-        
-        if(guid == null) {
+
+        if (guid == null) {
             throw new IllegalStateException("PreservationKey cannot be obtained for contributor: " + contributorId +
                     " in collection: " + collectionID);
         }
-        
+
         return guid;
     }
 
diff --git a/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/store/AuditTrailServiceDatabaseMigrator.java b/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/store/AuditTrailServiceDatabaseMigrator.java
index 3da998786..5872024c9 100644
--- a/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/store/AuditTrailServiceDatabaseMigrator.java
+++ b/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/store/AuditTrailServiceDatabaseMigrator.java
@@ -5,103 +5,114 @@
  * Copyright (C) 2010 - 2013 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.audittrails.store;
 
-import static org.bitrepository.audittrails.store.AuditDatabaseConstants.ACTOR_TABLE;
-import static org.bitrepository.audittrails.store.AuditDatabaseConstants.AUDITTRAIL_TABLE;
-import static org.bitrepository.audittrails.store.AuditDatabaseConstants.CONTRIBUTOR_TABLE;
-import static org.bitrepository.audittrails.store.AuditDatabaseConstants.DATABASE_VERSION_ENTRY;
-import static org.bitrepository.audittrails.store.AuditDatabaseConstants.FILE_TABLE;
-
-import java.util.Map;
-
 import org.bitrepository.service.database.DBConnector;
 import org.bitrepository.service.database.DatabaseMigrator;
 import org.bitrepository.service.database.DatabaseUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Map;
+
+import static org.bitrepository.audittrails.store.AuditDatabaseConstants.ACTOR_TABLE;
+import static org.bitrepository.audittrails.store.AuditDatabaseConstants.AUDIT_TRAIL_TABLE;
+import static org.bitrepository.audittrails.store.AuditDatabaseConstants.CONTRIBUTOR_TABLE;
+import static org.bitrepository.audittrails.store.AuditDatabaseConstants.DATABASE_VERSION_ENTRY;
+import static org.bitrepository.audittrails.store.AuditDatabaseConstants.FILE_TABLE;
+
 /**
  * Migration class for the AuditTrailDatabase of the AuditTrailService.
  * Will only try to perform the migration on an embedded derby database.
  */
 public class AuditTrailServiceDatabaseMigrator extends DatabaseMigrator {
-    /** The log.*/
     private static final Logger log = LoggerFactory.getLogger(DatabaseUtils.class);
-    
-    /** The name of the update script for version 1 to 2.*/
+    /**
+     * The name of the update script for version 1 to 2.
+     */
     private static final String UPDATE_SCRIPT_VERSION_1_TO_2 = "sql/derby/auditTrailServiceDBUpdate1to2.sql";
-    /** The name of the update script for version 2 to 3.*/
+    /**
+     * The name of the update script for version 2 to 3.
+     */
     private static final String UPDATE_SCRIPT_VERSION_2_TO_3 = "sql/derby/auditTrailServiceDBUpdate2to3.sql";
-    /** The name of the update script for version 3 to 4.*/
+    /**
+     * The name of the update script for version 3 to 4.
+     */
     private static final String UPDATE_SCRIPT_VERSION_3_TO_4 = "sql/derby/auditTrailServiceDBUpdate3to4.sql";
-    /** The name of the update script for version 4 to 5.*/
+    /**
+     * The name of the update script for version 4 to 5.
+     */
     private static final String UPDATE_SCRIPT_VERSION_4_TO_5 = "sql/derby/auditTrailServiceDBUpdate4to5.sql";
-    /** The name of the update script for version 5 to 6.*/
+    /**
+     * The name of the update script for version 5 to 6.
+     */
     private static final String UPDATE_SCRIPT_VERSION_5_TO_6 = "sql/derby/auditTrailServiceDBUpdate5to6.sql";
-    /** The current version of the database. */
+    /**
+     * The current version of the database.
+     */
     private final Integer currentVersion = 6;
-    
+
     /**
      * Constructor.
+     *
      * @param connector connection to the database.
      */
     public AuditTrailServiceDatabaseMigrator(DBConnector connector) {
         super(connector);
     }
-    
+
     @Override
     public void migrate() {
         Map<String, Integer> versions = getTableVersions();
-        
-        if(!versions.containsKey(FILE_TABLE)) {
-            throw new IllegalStateException("The database does not contain '" + FILE_TABLE 
+
+        if (!versions.containsKey(FILE_TABLE)) {
+            throw new IllegalStateException("The database does not contain '" + FILE_TABLE
                     + "' table as required.");
         }
-        if(!versions.containsKey(AUDITTRAIL_TABLE)) {
-            throw new IllegalStateException("The database does not contain '" + AUDITTRAIL_TABLE 
+        if (!versions.containsKey(AUDIT_TRAIL_TABLE)) {
+            throw new IllegalStateException("The database does not contain '" + AUDIT_TRAIL_TABLE
                     + "' table as required.");
         }
-        if(!versions.containsKey(CONTRIBUTOR_TABLE)) {
-            throw new IllegalStateException("The database does not contain '" + CONTRIBUTOR_TABLE 
+        if (!versions.containsKey(CONTRIBUTOR_TABLE)) {
+            throw new IllegalStateException("The database does not contain '" + CONTRIBUTOR_TABLE
                     + "' table as required.");
         }
-        if(!versions.containsKey(ACTOR_TABLE)) {
-            throw new IllegalStateException("The database does not contain '" + ACTOR_TABLE 
+        if (!versions.containsKey(ACTOR_TABLE)) {
+            throw new IllegalStateException("The database does not contain '" + ACTOR_TABLE
                     + "' table as required.");
         }
-        
-        if(!versions.containsKey(DATABASE_VERSION_ENTRY) || versions.get(DATABASE_VERSION_ENTRY) < 2) {
+
+        if (!versions.containsKey(DATABASE_VERSION_ENTRY) || versions.get(DATABASE_VERSION_ENTRY) < 2) {
             log.warn("Migrating AuditServiceDB from version 1 to 2.");
             migrateDerbyDatabase(UPDATE_SCRIPT_VERSION_1_TO_2);
         }
-        if(!versions.containsKey(DATABASE_VERSION_ENTRY) || versions.get(DATABASE_VERSION_ENTRY) < 3) {
+        if (!versions.containsKey(DATABASE_VERSION_ENTRY) || versions.get(DATABASE_VERSION_ENTRY) < 3) {
             log.warn("Migrating AuditServiceDB from version 2 to 3.");
             migrateDerbyDatabase(UPDATE_SCRIPT_VERSION_2_TO_3);
         }
-        if(!versions.containsKey(DATABASE_VERSION_ENTRY) || versions.get(DATABASE_VERSION_ENTRY) < 4) {
+        if (!versions.containsKey(DATABASE_VERSION_ENTRY) || versions.get(DATABASE_VERSION_ENTRY) < 4) {
             log.warn("Migrating AuditServiceDB from version 3 to 4.");
             migrateDerbyDatabase(UPDATE_SCRIPT_VERSION_3_TO_4);
         }
-        if(!versions.containsKey(DATABASE_VERSION_ENTRY) || versions.get(DATABASE_VERSION_ENTRY) < 5) {
+        if (!versions.containsKey(DATABASE_VERSION_ENTRY) || versions.get(DATABASE_VERSION_ENTRY) < 5) {
             log.warn("Migrating AuditServiceDB from version 4 to 5.");
             migrateDerbyDatabase(UPDATE_SCRIPT_VERSION_4_TO_5);
         }
-        if(!versions.containsKey(DATABASE_VERSION_ENTRY) || versions.get(DATABASE_VERSION_ENTRY) < 6) {
+        if (!versions.containsKey(DATABASE_VERSION_ENTRY) || versions.get(DATABASE_VERSION_ENTRY) < 6) {
             log.warn("Migrating AuditServiceDB from version 5 to 6.");
             migrateDerbyDatabase(UPDATE_SCRIPT_VERSION_5_TO_6);
         }
@@ -110,13 +121,13 @@ public void migrate() {
     @Override
     public boolean needsMigration() {
         Map<String, Integer> versions = getTableVersions();
-        
-        if(!versions.containsKey(DATABASE_VERSION_ENTRY)) {
-            throw new IllegalStateException("The database does not contain '" + DATABASE_VERSION_ENTRY 
+
+        if (!versions.containsKey(DATABASE_VERSION_ENTRY)) {
+            throw new IllegalStateException("The database does not contain '" + DATABASE_VERSION_ENTRY
                     + "' table as required.");
         }
-        
-        if(versions.get(DATABASE_VERSION_ENTRY) < currentVersion) {
+
+        if (versions.get(DATABASE_VERSION_ENTRY) < currentVersion) {
             return true;
         } else {
             return false;
diff --git a/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/store/AuditTrailStore.java b/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/store/AuditTrailStore.java
index 5bc5391a3..62f457837 100644
--- a/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/store/AuditTrailStore.java
+++ b/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/store/AuditTrailStore.java
@@ -1,111 +1,115 @@
 /*
  * #%L
  * Bitrepository Audit Trail Service
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.audittrails.store;
 
-import java.util.Date;
-import java.util.List;
-
 import org.bitrepository.bitrepositoryelements.AuditTrailEvents;
 import org.bitrepository.bitrepositoryelements.FileAction;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * Interface for the storage of audit trail information for the AuditTrailService.
  */
 public interface AuditTrailStore {
-    /** 
+    /**
      * Obtain AuditEventIterator for extracting audit trails from the store.
-     * When done with the iterator, the user should ensure that it is closed. 
-     * @param fileID [OPTIONAL] The id of the file for restricting the extraction.
-     * @param collectionID [OPTIONAL] The id of the collection from which to retrieve audit trails. 
+     * When done with the iterator, the user should ensure that it is closed.
+     *
+     * @param fileID        [OPTIONAL] The id of the file for restricting the extraction.
+     * @param collectionID  [OPTIONAL] The id of the collection from which to retrieve audit trails.
      * @param contributorId [OPTIONAL] The id of the contributor for restricting the extraction.
-     * @param minSeqNumber [OPTIONAL] The minimum sequence number for restricting the extraction.
-     * @param maxSeqNumber [OPTIONAL] The maximum sequence number for restricting the extraction.
-     * @param actorName [OPTIONAL] The name of the actor for restricting the extraction.
-     * @param operation [OPTIONAL] The FileAction operation for restricting the extraction.
-     * @param startDate [OPTIONAL] The earliest date for the audits for restricting the extraction.
-     * @param endDate [OPTIONAL] The latest date for the audits for restricting the extraction.
-     * @param fingerprint [OPTIONAL] The fingerprint of the certificate for the audits
-     * @param operationID [OPTIONAL] The ID of the operation (conversationID) for the audits
+     * @param minSeqNumber  [OPTIONAL] The minimum sequence number for restricting the extraction.
+     * @param maxSeqNumber  [OPTIONAL] The maximum sequence number for restricting the extraction.
+     * @param actorName     [OPTIONAL] The name of the actor for restricting the extraction.
+     * @param operation     [OPTIONAL] The FileAction operation for restricting the extraction.
+     * @param startDate     [OPTIONAL] The earliest date for the audits for restricting the extraction.
+     * @param endDate       [OPTIONAL] The latest date for the audits for restricting the extraction.
+     * @param fingerprint   [OPTIONAL] The fingerprint of the certificate for the audits
+     * @param operationID   [OPTIONAL] The ID of the operation (conversationID) for the audits
      * @return The requested audit trails from the store.
      */
     AuditEventIterator getAuditTrailsByIterator(String fileID, String collectionID, String contributorId,
-                                                Long minSeqNumber, Long maxSeqNumber, String actorName, FileAction operation, Date startDate,
+                                                Long minSeqNumber, Long maxSeqNumber, String actorName, FileAction operation,
+                                                Date startDate,
                                                 Date endDate, String fingerprint, String operationID);
-    
+
     /**
-     * ingest audit trails into the store. 
+     * ingest audit trails into the store.
+     *
      * @param auditTrailsEvents The audit trails to be ingested into the store.
-     * @param collectionID The id of the collection, where the audit trail events belong.
-     * @param contributorID The id of the contributor, that the audit trail event belongs to.
+     * @param collectionID      The id of the collection, where the audit trail events belong.
+     * @param contributorID     The id of the contributor, that the audit trail event belongs to.
      */
     void addAuditTrails(AuditTrailEvents auditTrailsEvents, String collectionID, String contributorID);
-    
+
     /**
      * Retrieves the largest sequence number for a given contributor.
-     * 
+     *
      * @param contributorId The id of the contributor to retrieve the largest sequence number from.
-     * @param collectionID The id of the collection for the sequence number of the contributor.
+     * @param collectionID  The id of the collection for the sequence number of the contributor.
      * @return The largest sequence number.
      */
     long largestSequenceNumber(String contributorId, String collectionID);
-    
+
     /**
      * Retrieves the preservation sequence number for the given contributor, which tells how far the preservation
      * of the audit trails has gotten.
-     *  
+     *
      * @param contributorId The id of the contributor.
-     * @param collectionID The id of the collection for the sequence number of the contributor.
+     * @param collectionID  The id of the collection for the sequence number of the contributor.
      * @return The preservation sequence number for the given contributor.
      */
     long getPreservationSequenceNumber(String contributorId, String collectionID);
-    
+
     /**
      * Set the preservation sequence number for the given contributor.
-     * 
+     *
      * @param contributorId The id of the contributor.
-     * @param collectionID The id of the collection for the sequence number of the contributor.
-     * @param seqNumber The new preservation sequence number for the given contributor.
+     * @param collectionID  The id of the collection for the sequence number of the contributor.
+     * @param seqNumber     The new preservation sequence number for the given contributor.
      */
     void setPreservationSequenceNumber(String contributorId, String collectionID, long seqNumber);
 
     /**
      * Check to see if the database knows a contributor
-     * 
-     *  @param contributorID The ID of the contributor
-     *  @param collectionID The ID of the collection;
-     *  @return boolean true, if the contributor is known by the database, false otherwise.
+     *
+     * @param contributorID The ID of the contributor
+     * @param collectionID  The ID of the collection;
+     * @return boolean true, if the contributor is known by the database, false otherwise.
      */
     boolean havePreservationKey(String contributorID, String collectionID);
-    
+
     /**
-     * Get the list of known audittrail contributors. I.e. those contributors which have delivered
-     * audit trails for the database. 
-     * 
-     * @return List containing the IDs of the contributors that the database have audittrails from.
+     * Get the list of known audit trail contributors. I.e. those contributors which have delivered
+     * audit trails for the database.
+     *
+     * @return List containing the IDs of the contributors that the database have audit trails from.
      */
     List<String> getKnownContributors();
+
     /**
      * Closes the store.
      */
diff --git a/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/store/ExtractModel.java b/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/store/ExtractModel.java
index d7a003fd3..eb9e9ac9b 100644
--- a/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/store/ExtractModel.java
+++ b/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/store/ExtractModel.java
@@ -5,205 +5,215 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.audittrails.store;
 
-import java.util.Date;
-
 import org.bitrepository.bitrepositoryelements.FileAction;
 
+import java.util.Date;
+
 /**
  * Container for the extraction of data from the audit trail database.
  */
 class ExtractModel {
-    /** @see #getFileId(). */
+    /**
+     * @see #getFileId().
+     */
     private String fileID;
-    /** @see #getCollectionId(). */
+    /**
+     * @see #getCollectionId().
+     */
     private String collectionID;
-    /** @see #getContributorId(). */
+    /**
+     * @see #getContributorId().
+     */
     private String contributorId;
-    /** @see #getMinSeqNumber(). */
+    /**
+     * @see #getMinSeqNumber().
+     */
     private Long minSeqNumber;
-    /** @see #getMaxSeqNumber(). */
+    /**
+     * @see #getMaxSeqNumber().
+     */
     private Long maxSeqNumber;
-    /** @see #getActorName(). */
+    /**
+     * @see #getActorName().
+     */
     private String actorName;
-    /** @see #getOperation(). */
+    /**
+     * @see #getOperation().
+     */
     private FileAction operation;
-    /** @see #getStartDate(). */
+    /**
+     * @see #getStartDate().
+     */
     private Date startDate;
-    /** @see #getEndDate(). */
+    /**
+     * @see #getEndDate().
+     */
     private Date endDate;
-    /** @see #getFingerprint(). */
+    /**
+     * @see #getFingerprint().
+     */
     private String fingerprint;
-    /** @see #getOperationID(). */
-    private String operationID;
-    
     /**
-     * Constructor, with no arguments. All variables are set to null.
+     * @see #getOperationID().
      */
+    private String operationID;
+
     public ExtractModel() {
-        
     }
-    
+
     /**
      * @return The fileID;
      */
     public String getFileId() {
         return fileID;
     }
-    
+
     /**
-     * @see getFileId();
      * @param fileID The new file id.
      */
     public void setFileId(String fileID) {
         this.fileID = fileID;
     }
-    
+
     /**
      * @return The collectionID;
      */
     public String getCollectionId() {
         return collectionID;
     }
-    
+
     /**
-     * @see getCollectionID();
      * @param collectionID The new collection id.
      */
     public void setCollectionId(String collectionID) {
         this.collectionID = collectionID;
     }
-    
+
     /**
      * @return The contributorId;
      */
     public String getContributorId() {
         return contributorId;
     }
-    
+
     /**
-     * @see getContributorId();
      * @param contributorId The new id of the contributor.
      */
     public void setContributorId(String contributorId) {
         this.contributorId = contributorId;
     }
-    
+
     /**
      * @return The minSeqNumber;
      */
     public Long getMinSeqNumber() {
         return minSeqNumber;
     }
-    
+
     /**
-     * @see getMinSeqNumberId();
      * @param minSeqNumber The new minimum sequence number.
      */
     public void setMinSeqNumber(Long minSeqNumber) {
         this.minSeqNumber = minSeqNumber;
     }
-    
+
     /**
      * @return The maxSeqNumber;
      */
     public Long getMaxSeqNumber() {
         return maxSeqNumber;
     }
-    
+
     /**
-     * @see getMaxSeqNumberId();
      * @param maxSeqNumber The new maximum sequence number.
      */
     public void setMaxSeqNumber(Long maxSeqNumber) {
         this.maxSeqNumber = maxSeqNumber;
     }
-    
+
     /**
      * @return The actorName;
      */
     public String getActorName() {
         return actorName;
     }
-    
+
     /**
-     * @see getActorName();
      * @param actorName The new name of the actor.
      */
     public void setActorName(String actorName) {
         this.actorName = actorName;
     }
-    
+
     /**
      * @return The operation;
      */
     public FileAction getOperation() {
         return operation;
     }
-    
+
     /**
-     * @see getOperation();
      * @param operation The operation.
      */
     public void setOperation(FileAction operation) {
         this.operation = operation;
     }
-    
+
     /**
      * @return The startDate;
      */
     public Date getStartDate() {
         return startDate;
     }
-    
+
     /**
-     * @see getStartDate();
      * @param startDate The startDate.
      */
     public void setStartDate(Date startDate) {
         this.startDate = startDate;
     }
-    
+
     /**
      * @return The endDate;
      */
     public Date getEndDate() {
         return endDate;
     }
-    
+
     /**
-     * @see #getEndDate();
      * @param endDate The endDate.
+     * @see #getEndDate();
      */
     public void setEndDate(Date endDate) {
         this.endDate = endDate;
     }
 
     /**
-     * @return The fingerprint of the certificate 
+     * @return The fingerprint of the certificate
      */
     public String getFingerprint() {
         return fingerprint;
     }
 
     /**
-     * @see #getFingerprint();
      * @param fingerprint the fingerprint
+     * @see #getFingerprint();
      */
     public void setFingerprint(String fingerprint) {
         this.fingerprint = fingerprint;
@@ -217,8 +227,8 @@ public String getOperationID() {
     }
 
     /**
-     * @see #getOperationID();
      * @param operationID The ID of the operation
+     * @see #getOperationID();
      */
     public void setOperationID(String operationID) {
         this.operationID = operationID;
diff --git a/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/webservice/AuditTrailServiceContextListener.java b/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/webservice/AuditTrailServiceContextListener.java
index 6288b09c6..8e91e9c1b 100644
--- a/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/webservice/AuditTrailServiceContextListener.java
+++ b/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/webservice/AuditTrailServiceContextListener.java
@@ -1,23 +1,23 @@
 /*
  * #%L
  * Bitrepository Audit Trail Service
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -32,15 +32,15 @@
  * The Context listener for the AuditTrailService
  */
 public class AuditTrailServiceContextListener extends AbstractBitrepositoryContextListener {
-       
+
     @Override
     public LifeCycledService getService() {
         return AuditTrailServiceFactory.getAuditTrailService();
     }
 
     @Override
-    public void initialize(String configutrationDir) {
-        AuditTrailServiceFactory.init(configutrationDir);        
+    public void initialize(String configurationDir) {
+        AuditTrailServiceFactory.init(configurationDir);
     }
 
     @Override
diff --git a/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/webservice/CollectorInfo.java b/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/webservice/CollectorInfo.java
index 301efeb6d..4da5e144e 100644
--- a/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/webservice/CollectorInfo.java
+++ b/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/webservice/CollectorInfo.java
@@ -8,12 +8,12 @@
  * it under the terms of the GNU Lesser General Public License as
  * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
@@ -28,40 +28,49 @@ public class CollectorInfo {
 
     String collectionID;
     String lastStart;
-    String lastDuration; 
+    String lastDuration;
     String nextStart;
     long collectedAudits;
-    
+
     public String getCollectionID() {
         return collectionID;
     }
+
     public void setCollectionID(String collectionID) {
         this.collectionID = collectionID;
     }
+
     public String getLastStart() {
         return lastStart;
     }
+
     public void setLastStart(String lastStart) {
         this.lastStart = lastStart;
     }
+
     public String getNextStart() {
         return nextStart;
     }
+
     public void setNextStart(String nextStart) {
         this.nextStart = nextStart;
     }
+
     public String getLastDuration() {
         return lastDuration;
     }
+
     public void setLastDuration(String lastDuration) {
         this.lastDuration = lastDuration;
     }
+
     public long getCollectedAudits() {
         return collectedAudits;
     }
+
     public void setCollectedAudits(long collectedAudits) {
         this.collectedAudits = collectedAudits;
     }
-    
-    
+
+
 }
diff --git a/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/webservice/RestAuditTrailService.java b/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/webservice/RestAuditTrailService.java
index 0233de686..aae6baab9 100644
--- a/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/webservice/RestAuditTrailService.java
+++ b/bitrepository-audit-trail-service/src/main/java/org/bitrepository/audittrails/webservice/RestAuditTrailService.java
@@ -1,34 +1,41 @@
 /*
  * #%L
  * Bitrepository Audit Trail Service
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.audittrails.webservice;
 
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.Date;
-import java.util.List;
-import java.util.TimeZone;
+import com.fasterxml.jackson.core.JsonEncoding;
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.JsonGenerator;
+import org.bitrepository.audittrails.AuditTrailService;
+import org.bitrepository.audittrails.AuditTrailServiceFactory;
+import org.bitrepository.audittrails.store.AuditEventIterator;
+import org.bitrepository.bitrepositoryelements.AuditTrailEvent;
+import org.bitrepository.bitrepositoryelements.FileAction;
+import org.bitrepository.common.utils.CalendarUtils;
+import org.bitrepository.common.utils.TimeUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DefaultValue;
@@ -41,92 +48,89 @@
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.StreamingOutput;
-
-import org.bitrepository.audittrails.AuditTrailService;
-import org.bitrepository.audittrails.AuditTrailServiceFactory;
-import org.bitrepository.audittrails.store.AuditEventIterator;
-import org.bitrepository.bitrepositoryelements.AuditTrailEvent;
-import org.bitrepository.bitrepositoryelements.FileAction;
-import org.bitrepository.common.utils.CalendarUtils;
-import org.bitrepository.common.utils.TimeUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.fasterxml.jackson.core.JsonEncoding;
-import com.fasterxml.jackson.core.JsonFactory;
-import com.fasterxml.jackson.core.JsonGenerationException;
-import com.fasterxml.jackson.core.JsonGenerator;
+import java.io.IOException;
+import java.sql.SQLException;
+import java.util.Date;
+import java.util.List;
+import java.util.TimeZone;
 
 @Path("/AuditTrailService")
 
 public class RestAuditTrailService {
-    /** The log.*/
-    private Logger log = LoggerFactory.getLogger(getClass());
-    private AuditTrailService service;
-    private CalendarUtils calendarUtils = CalendarUtils.getInstance(TimeZone.getDefault());
-    
+    /**
+     * The log.
+     */
+    private final Logger log = LoggerFactory.getLogger(getClass());
+    private final AuditTrailService service;
+    private final CalendarUtils calendarUtils = CalendarUtils.getInstance(TimeZone.getDefault());
+
     public RestAuditTrailService() {
-        service = AuditTrailServiceFactory.getAuditTrailService();	
+        service = AuditTrailServiceFactory.getAuditTrailService();
     }
-        
+
     @POST
     @Path("/queryAuditTrailEvents/")
     @Consumes("application/x-www-form-urlencoded")
     @Produces("application/json")
     public StreamingOutput queryAuditTrailEvents(
-            @FormParam("fromDate") String fromDate,
-            @FormParam("toDate") String toDate,
-            @FormParam("fileID") String fileID,
-            @FormParam("reportingComponent") String reportingComponent,
-            @FormParam("actor") String actor,
-            @FormParam("action") String action,
-            @FormParam("collectionID") String collectionID,
-            @FormParam("fingerprint") String fingerprint,
-            @FormParam("operationID") String operationID,
-            @DefaultValue("1000") @FormParam("maxAudittrails") Integer maxResults) {
+            @FormParam("fromDate")
+                    String fromDate,
+            @FormParam("toDate")
+                    String toDate,
+            @FormParam("fileID")
+                    String fileID,
+            @FormParam("reportingComponent")
+                    String reportingComponent,
+            @FormParam("actor")
+                    String actor,
+            @FormParam("action")
+                    String action,
+            @FormParam("collectionID")
+                    String collectionID,
+            @FormParam("fingerprint")
+                    String fingerprint,
+            @FormParam("operationID")
+                    String operationID,
+            @DefaultValue("1000")
+            @FormParam("maxAudittrails")
+                    Integer maxResults) {
         Date from = calendarUtils.makeStartDateObject(fromDate);
         Date to = calendarUtils.makeEndDateObject(toDate);
-        
+
         final int maxAudits = maxResults;
-        final AuditEventIterator it = service.queryAuditTrailEventsByIterator(from, to, contentOrNull(fileID),
-                collectionID, contentOrNull(reportingComponent), contentOrNull(actor), filterAction(action), 
-                contentOrNull(fingerprint), contentOrNull(operationID));
-        if(it != null) {     
-            return new StreamingOutput() {
-                public void write(OutputStream output) throws IOException, WebApplicationException {
-                    JsonFactory jf = new JsonFactory();
-                    JsonGenerator jg = jf.createGenerator(output, JsonEncoding.UTF8);
+        final AuditEventIterator it = service.queryAuditTrailEventsByIterator(from, to, contentOrNull(fileID), collectionID,
+                contentOrNull(reportingComponent), contentOrNull(actor), filterAction(action), contentOrNull(fingerprint),
+                contentOrNull(operationID));
+        if (it != null) {
+            return output -> {
+                JsonFactory jf = new JsonFactory();
+                JsonGenerator jg = jf.createGenerator(output, JsonEncoding.UTF8);
+                try {
+                    AuditTrailEvent event;
+                    jg.writeStartArray();
+                    int numAudits = 0;
+                    while ((event = it.getNextAuditTrailEvent()) != null && numAudits < maxAudits) {
+                        writeAuditResult(event, jg);
+                        numAudits++;
+                    }
+                    jg.writeEndArray();
+                    jg.flush();
+                    jg.close();
+                } catch (Exception e) {
+                    log.error("Caught exception trying to stream audit trails", e);
+                    throw new WebApplicationException(e);
+                } finally {
                     try {
-                        AuditTrailEvent event;
-                        jg.writeStartArray();
-                        int numAudits = 0;
-                        while((event = it.getNextAuditTrailEvent()) != null && numAudits < maxAudits) {
-                            writeAuditResult(event, jg);
-                            numAudits++;
-                        }
-                        jg.writeEndArray();
-                        jg.flush();
-                        jg.close();
-                    } catch (Exception e) {
-                        log.error("Caught exception trying to stream audittrails", e);
+                        it.close();
+                    } catch (SQLException e) {
+                        log.error("Caught exception when closing AuditEventIterator", e);
                         throw new WebApplicationException(e);
-                    } finally {
-                        try {
-                            if(it != null) {
-                                it.close();
-                            }
-                        } catch (Exception e) {
-                            log.error("Caught exception when closing AuditEventIterator", e);
-                            throw new WebApplicationException(e);
-                        }
                     }
                 }
             };
         } else {
-            throw new WebApplicationException(Response.status(Response.Status.NO_CONTENT)
-                    .entity("Failed to get audit trails from database")
-                    .type(MediaType.TEXT_PLAIN)
-                    .build());
+            throw new WebApplicationException(Response.status(Response.Status.NO_CONTENT).entity("Failed to get audit trails from database")
+                    .type(MediaType.TEXT_PLAIN).build());
         }
     }
 
@@ -135,31 +139,30 @@ public void write(OutputStream output) throws IOException, WebApplicationExcepti
     @Produces("text/html")
     public String collectAuditTrails() {
         service.collectAuditTrails();
-        return "Started audittrails collection";
+        return "Started audit trails collection";
     }
-    
+
     @GET
     @Path("/collectionSchedule")
     @Produces(MediaType.APPLICATION_JSON)
     public List<CollectorInfo> getCollectionSchedule() {
         return service.getCollectorInfos();
     }
-    
-    private void writeAuditResult(AuditTrailEvent event, JsonGenerator jg) throws JsonGenerationException, IOException {
+
+    private void writeAuditResult(AuditTrailEvent event, JsonGenerator jg) throws IOException {
         jg.writeStartObject();
         jg.writeObjectField("fileID", event.getFileID());
         jg.writeObjectField("reportingComponent", event.getReportingComponent());
         jg.writeObjectField("actor", contentOrEmptyString(event.getActorOnFile()));
         jg.writeObjectField("action", event.getActionOnFile().toString());
-        jg.writeObjectField("timeStamp", TimeUtils.shortDate(
-                CalendarUtils.convertFromXMLGregorianCalendar(event.getActionDateTime())));
+        jg.writeObjectField("timeStamp", TimeUtils.shortDate(CalendarUtils.convertFromXMLGregorianCalendar(event.getActionDateTime())));
         jg.writeObjectField("info", contentOrEmptyString(event.getInfo()));
         jg.writeObjectField("auditTrailInfo", contentOrEmptyString(event.getAuditTrailInformation()));
         jg.writeObjectField("fingerprint", contentOrEmptyString(event.getCertificateID()));
         jg.writeObjectField("operationID", contentOrEmptyString(event.getOperationID()));
         jg.writeEndObject();
         jg.flush();
-        
+
     }
 
     @GET
@@ -168,9 +171,9 @@ private void writeAuditResult(AuditTrailEvent event, JsonGenerator jg) throws Js
     public List<String> getContributors() {
         return service.getContributors();
     }
-    
+
     private FileAction filterAction(String action) {
-        if(action.equals("ALL")) {
+        if (action.equals("ALL")) {
             return null;
         } else {
             return FileAction.fromValue(action);
@@ -178,17 +181,18 @@ private FileAction filterAction(String action) {
     }
 
     private String contentOrEmptyString(String input) {
-        if(input == null) {
+        if (input == null) {
             return "";
         } else {
             return input.trim();
         }
     }
-    
+
     private String contentOrNull(String input) {
-        if(input != null && input.trim().isEmpty()) {
+        if (input != null && input.trim().isEmpty()) {
             return null;
         } else {
+            assert input != null;
             return input.trim();
         }
     }
diff --git a/bitrepository-audit-trail-service/src/test/java/org/bitrepository/audittrails/collector/AuditCollectorTest.java b/bitrepository-audit-trail-service/src/test/java/org/bitrepository/audittrails/collector/AuditCollectorTest.java
index 5e612b0b8..82533d46e 100644
--- a/bitrepository-audit-trail-service/src/test/java/org/bitrepository/audittrails/collector/AuditCollectorTest.java
+++ b/bitrepository-audit-trail-service/src/test/java/org/bitrepository/audittrails/collector/AuditCollectorTest.java
@@ -21,13 +21,6 @@
  */
 package org.bitrepository.audittrails.collector;
 
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.isNull;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.timeout;
-import static org.mockito.Mockito.verify;
-
 import org.bitrepository.access.getaudittrails.AuditTrailClient;
 import org.bitrepository.access.getaudittrails.AuditTrailQuery;
 import org.bitrepository.access.getaudittrails.client.AuditTrailResult;
@@ -46,6 +39,13 @@
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isNull;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.timeout;
+import static org.mockito.Mockito.verify;
+
 public class AuditCollectorTest extends ExtendedTestCase {
     /** The settings for the tests. Should be instantiated in the setup.*/
     Settings settings;
diff --git a/bitrepository-audit-trail-service/src/test/java/org/bitrepository/audittrails/preserver/AuditPreservationEventHandlerTest.java b/bitrepository-audit-trail-service/src/test/java/org/bitrepository/audittrails/preserver/AuditPreservationEventHandlerTest.java
index e4f3f2547..8dfff35f3 100644
--- a/bitrepository-audit-trail-service/src/test/java/org/bitrepository/audittrails/preserver/AuditPreservationEventHandlerTest.java
+++ b/bitrepository-audit-trail-service/src/test/java/org/bitrepository/audittrails/preserver/AuditPreservationEventHandlerTest.java
@@ -21,6 +21,14 @@
  */
 package org.bitrepository.audittrails.preserver;
 
+import org.bitrepository.audittrails.store.AuditTrailStore;
+import org.bitrepository.client.eventhandler.CompleteEvent;
+import org.jaccept.structure.ExtendedTestCase;
+import org.testng.annotations.Test;
+
+import java.util.HashMap;
+import java.util.Map;
+
 import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
@@ -28,14 +36,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import java.util.HashMap;
-import java.util.Map;
-
-import org.bitrepository.audittrails.store.AuditTrailStore;
-import org.bitrepository.client.eventhandler.CompleteEvent;
-import org.jaccept.structure.ExtendedTestCase;
-import org.testng.annotations.Test;
-
 public class AuditPreservationEventHandlerTest extends ExtendedTestCase {
     String PILLARID = "pillarID";
     public static final String TEST_COLLECTION = "dummy-collection";
diff --git a/bitrepository-audit-trail-service/src/test/java/org/bitrepository/audittrails/store/AuditDatabaseTest.java b/bitrepository-audit-trail-service/src/test/java/org/bitrepository/audittrails/store/AuditDatabaseTest.java
index db8ace84b..c2f0b220e 100644
--- a/bitrepository-audit-trail-service/src/test/java/org/bitrepository/audittrails/store/AuditDatabaseTest.java
+++ b/bitrepository-audit-trail-service/src/test/java/org/bitrepository/audittrails/store/AuditDatabaseTest.java
@@ -21,16 +21,6 @@
  */
 package org.bitrepository.audittrails.store;
 
-import java.math.BigInteger;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Locale;
-
-import javax.xml.datatype.XMLGregorianCalendar;
-
 import org.bitrepository.bitrepositoryelements.AuditTrailEvent;
 import org.bitrepository.bitrepositoryelements.AuditTrailEvents;
 import org.bitrepository.bitrepositoryelements.FileAction;
@@ -44,6 +34,15 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import javax.xml.datatype.XMLGregorianCalendar;
+import java.math.BigInteger;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+
 public class AuditDatabaseTest extends ExtendedTestCase {
     /** The settings for the tests. Should be instantiated in the setup.*/
     Settings settings;
diff --git a/bitrepository-audit-trail-service/src/test/java/org/bitrepository/audittrails/store/AuditServiceDatabaseMigrationTest.java b/bitrepository-audit-trail-service/src/test/java/org/bitrepository/audittrails/store/AuditServiceDatabaseMigrationTest.java
index 8f2fc8ce3..a7b76f976 100644
--- a/bitrepository-audit-trail-service/src/test/java/org/bitrepository/audittrails/store/AuditServiceDatabaseMigrationTest.java
+++ b/bitrepository-audit-trail-service/src/test/java/org/bitrepository/audittrails/store/AuditServiceDatabaseMigrationTest.java
@@ -21,8 +21,6 @@
  */
 package org.bitrepository.audittrails.store;
 
-import java.io.File;
-
 import org.bitrepository.common.settings.Settings;
 import org.bitrepository.common.settings.TestSettingsProvider;
 import org.bitrepository.common.utils.FileUtils;
@@ -35,7 +33,9 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-import static org.bitrepository.audittrails.store.AuditDatabaseConstants.AUDITTRAIL_TABLE;
+import java.io.File;
+
+import static org.bitrepository.audittrails.store.AuditDatabaseConstants.AUDIT_TRAIL_TABLE;
 import static org.bitrepository.audittrails.store.AuditDatabaseConstants.DATABASE_VERSION_ENTRY;
 import static org.testng.Assert.assertEquals;
 
@@ -76,7 +76,7 @@ public void testMigratingAuditServiceDatabase() {
 
         addStep("Validate setup", "audit table has version 2 and database version 2");
         String extractVersionSql = "SELECT version FROM tableversions WHERE tablename = ?";
-        int auditTableVersionBefore = DatabaseUtils.selectIntValue(connector, extractVersionSql, AUDITTRAIL_TABLE);
+        int auditTableVersionBefore = DatabaseUtils.selectIntValue(connector, extractVersionSql, AUDIT_TRAIL_TABLE);
         assertEquals(auditTableVersionBefore, 2, "Table version before migration");
         int dbTableVersionBefore = DatabaseUtils.selectIntValue(connector, extractVersionSql, DATABASE_VERSION_ENTRY);
         assertEquals(dbTableVersionBefore, 2, "Table version before migration");
@@ -84,7 +84,7 @@ public void testMigratingAuditServiceDatabase() {
         addStep("Perform migration", "audit table version 5 and database-version is 6");
         AuditTrailServiceDatabaseMigrator migrator = new AuditTrailServiceDatabaseMigrator(connector);
         migrator.migrate();
-        int auditTableVersionAfter = DatabaseUtils.selectIntValue(connector, extractVersionSql, AUDITTRAIL_TABLE);
+        int auditTableVersionAfter = DatabaseUtils.selectIntValue(connector, extractVersionSql, AUDIT_TRAIL_TABLE);
         assertEquals(auditTableVersionAfter, 5, "Table version after migration");
         int dbTableVersionAfter = DatabaseUtils.selectIntValue(connector, extractVersionSql, DATABASE_VERSION_ENTRY);
         assertEquals(dbTableVersionAfter, 6, "Table version after migration");
diff --git a/bitrepository-audit-trail-service/src/test/java/org/bitrepository/audittrails/store/AuditTrailReadDAO.java b/bitrepository-audit-trail-service/src/test/java/org/bitrepository/audittrails/store/AuditTrailReadDAO.java
index 62687f13a..1a316d4d3 100644
--- a/bitrepository-audit-trail-service/src/test/java/org/bitrepository/audittrails/store/AuditTrailReadDAO.java
+++ b/bitrepository-audit-trail-service/src/test/java/org/bitrepository/audittrails/store/AuditTrailReadDAO.java
@@ -25,18 +25,18 @@
 import org.bitrepository.service.database.DatabaseManager;
 import org.bitrepository.service.database.DatabaseUtils;
 
+import java.util.List;
+
+import static org.bitrepository.audittrails.store.AuditDatabaseConstants.ACTOR_NAME;
+import static org.bitrepository.audittrails.store.AuditDatabaseConstants.ACTOR_TABLE;
 import static org.bitrepository.audittrails.store.AuditDatabaseConstants.COLLECTION_ID;
 import static org.bitrepository.audittrails.store.AuditDatabaseConstants.COLLECTION_KEY;
 import static org.bitrepository.audittrails.store.AuditDatabaseConstants.COLLECTION_TABLE;
-import static org.bitrepository.audittrails.store.AuditDatabaseConstants.FILE_TABLE;
-import static org.bitrepository.audittrails.store.AuditDatabaseConstants.FILE_FILEID;
-import static org.bitrepository.audittrails.store.AuditDatabaseConstants.FILE_COLLECTION_KEY;
 import static org.bitrepository.audittrails.store.AuditDatabaseConstants.CONTRIBUTOR_ID;
 import static org.bitrepository.audittrails.store.AuditDatabaseConstants.CONTRIBUTOR_TABLE;
-import static org.bitrepository.audittrails.store.AuditDatabaseConstants.ACTOR_NAME;
-import static org.bitrepository.audittrails.store.AuditDatabaseConstants.ACTOR_TABLE;
-
-import java.util.List;
+import static org.bitrepository.audittrails.store.AuditDatabaseConstants.FILE_COLLECTION_KEY;
+import static org.bitrepository.audittrails.store.AuditDatabaseConstants.FILE_FILE_ID;
+import static org.bitrepository.audittrails.store.AuditDatabaseConstants.FILE_TABLE;
 
 /**
  * DAO class for read access to the AuditTrail database for test purposes  
@@ -56,7 +56,7 @@ public List<String> getCollectionIDs() {
     }
     
     public List<String> getFileIDs(String collectionID) {
-        String selectSql = "SELECT " + FILE_FILEID + " FROM " + FILE_TABLE
+        String selectSql = "SELECT " + FILE_FILE_ID + " FROM " + FILE_TABLE
                 + " JOIN " + COLLECTION_TABLE 
                 + " ON " + FILE_TABLE + "." + FILE_COLLECTION_KEY + " = " + COLLECTION_TABLE + "." + COLLECTION_KEY
                 + " WHERE " + COLLECTION_ID + " = ?";
diff --git a/bitrepository-client/src/main/java/org/bitrepository/access/AccessComponentFactory.java b/bitrepository-client/src/main/java/org/bitrepository/access/AccessComponentFactory.java
index 51570f4cb..98e35d8f1 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/access/AccessComponentFactory.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/access/AccessComponentFactory.java
@@ -8,16 +8,16 @@
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -34,101 +34,96 @@
 import org.bitrepository.access.getfileids.GetFileIDsClient;
 import org.bitrepository.access.getstatus.ConversationBasedGetStatusClient;
 import org.bitrepository.access.getstatus.GetStatusClient;
+import org.bitrepository.client.conversation.mediator.ConversationMediatorManager;
 import org.bitrepository.common.settings.Settings;
 import org.bitrepository.protocol.ProtocolComponentFactory;
-import org.bitrepository.client.conversation.mediator.ConversationMediatorManager;
 import org.bitrepository.protocol.security.SecurityManager;
 
-/**
- * Factory class for the access module.
- * Instantiates the instances of the interfaces within this module.
- */
 public final class AccessComponentFactory {
-    /** The singleton instance. */
     private static AccessComponentFactory instance;
-    
+
     /**
-     * Instantiation of this singleton.
+     * Instantiation of the class as a singleton.
      *
      * @return The singleton instance of this factory class.
      */
     public static synchronized AccessComponentFactory getInstance() {
-        // ensure singleton.
-        if(instance == null) {
+        if (instance == null) {
             instance = new AccessComponentFactory();
         }
         return instance;
     }
 
-    /**
-     * Private constructor for initialization of the singleton.
-     */
     private AccessComponentFactory() {
     }
 
     /**
      * Method for getting a GetFileClient as defined in the access configuration.<p>
      *
-     * @param settings The settings for the GetFileClient.
+     * @param settings        The settings for the GetFileClient.
      * @param securityManager The SecurityManager for the client
-     * @param clientID The ID of the client
-     * @return A GetFileClient.
+     * @param clientID        The ID of the client
+     * @return A GetFileClient created form the given arguments.
      */
     public GetFileClient createGetFileClient(Settings settings, SecurityManager securityManager, String clientID) {
         return new ConversationBasedGetFileClient(
-                ProtocolComponentFactory.getInstance().getMessageBus(settings, securityManager), 
-                ConversationMediatorManager.getConversationMediator(settings, securityManager), 
+                ProtocolComponentFactory.getInstance().getMessageBus(settings, securityManager),
+                ConversationMediatorManager.getConversationMediator(settings, securityManager),
                 settings, clientID);
     }
-    
+
     /**
-     * Method for instantiating a GetChecksumsClient as defined in the access configurations.
-     * @param settings The settings for the GetChecksumsClient.
+     * Returns a GetChecksumsClient as defined in the access configurations.
+     *
+     * @param settings        The settings for the GetChecksumsClient.
      * @param securityManager The SecurityManager for the client
-     * @param clientID The ID of the client
-     * @return The GetChecksumsClient
+     * @param clientID        The ID of the client
+     * @return The GetChecksumsClient created from the given arguments.
      */
     public GetChecksumsClient createGetChecksumsClient(Settings settings, SecurityManager securityManager, String clientID) {
         return new ConversationBasedGetChecksumsClient(
-                ProtocolComponentFactory.getInstance().getMessageBus(settings, securityManager), 
+                ProtocolComponentFactory.getInstance().getMessageBus(settings, securityManager),
                 ConversationMediatorManager.getConversationMediator(settings, securityManager),
                 settings, clientID);
     }
 
     /**
-     * Method for getting a GetFileIDsClient as defined in the access configuration.<p>
-     * @param settings The settings for the GetFileIDsClient.
+     * Instantiates a GetFileIDsClient as defined in the access configuration.<p>
+     *
+     * @param settings        The settings for the GetFileIDsClient.
      * @param securityManager The SecurityManager for the client
-     * @param clientID The ID of the client
-     * @return A GetFileIDsClient.
+     * @param clientID        The ID of the client
+     * @return A GetFileIDsClient created from the given arguments.
      */
     public GetFileIDsClient createGetFileIDsClient(Settings settings, SecurityManager securityManager, String clientID) {
         return new ConversationBasedGetFileIDsClient(
-                ProtocolComponentFactory.getInstance().getMessageBus(settings, securityManager), 
+                ProtocolComponentFactory.getInstance().getMessageBus(settings, securityManager),
                 ConversationMediatorManager.getConversationMediator(settings, securityManager),
                 settings, clientID);
     }
-    
+
     /**
-     * Method for getting a GetStatusClient as defined in the access configuration.<p>
-     * @param settings The settings for the GetStatusClient.
+     * Instantiates a GetStatusClient as defined in the access configuration.<p>
+     *
+     * @param settings        The settings for the GetStatusClient.
      * @param securityManager The SecurityManager for the client
-     * @param clientID The ID of the client
-     * @return A GetStatusClient.
+     * @param clientID        The ID of the client
+     * @return A GetStatusClient created from the given arguments.
      */
     public GetStatusClient createGetStatusClient(Settings settings, SecurityManager securityManager, String clientID) {
         return new ConversationBasedGetStatusClient(
-                ProtocolComponentFactory.getInstance().getMessageBus(settings, securityManager), 
+                ProtocolComponentFactory.getInstance().getMessageBus(settings, securityManager),
                 ConversationMediatorManager.getConversationMediator(settings, securityManager),
                 settings, clientID);
     }
 
     /**
-     * Method for getting a AuditTrailClient as defined in the access configuration.<p>
-     * @param settings The settings for the AuditTrailClient.
+     * Instantiates a AuditTrailClient as defined in the access configuration.<p>
+     *
+     * @param settings        The settings for the AuditTrailClient.
      * @param securityManager The SecurityManager for the client
-     * @param clientID The ID of the client
-     * @return A AuditTrailClient.
+     * @param clientID        The ID of the client
+     * @return A AuditTrailClient created from the given arguments.
      */
     public AuditTrailClient createAuditTrailClient(Settings settings, SecurityManager securityManager, String clientID) {
         return new ConversationBasedAuditTrailClient(
diff --git a/bitrepository-client/src/main/java/org/bitrepository/access/ContributorQuery.java b/bitrepository-client/src/main/java/org/bitrepository/access/ContributorQuery.java
index 3bd354ec2..103921a0f 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/access/ContributorQuery.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/access/ContributorQuery.java
@@ -1,23 +1,23 @@
 /*
  * #%L
  * Bitrepository Access
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -31,9 +31,8 @@
  * <p>The ContributorQuery functionality can be used to request results in chunks. This is useful if the number of
  * potential results might be very large, which might cause OutOfMemory problems. A full result can be listed though
  * paging through the chunks by: <ol>
- *     <li>Making a request with <code>maxNumberOfResults</code> set to the </li>
+ * <li>Making a request with <code>maxNumberOfResults</code> set to the </li>
  * </ol>
- * 
  */
 public class ContributorQuery {
     private final String componentID;
@@ -42,13 +41,13 @@ public class ContributorQuery {
     private final Integer maxNumberOfResults;
 
     /**
-     * @param componentID If set, only results from the indicated component is requested.
-     * @param minTimestamp If set, only elements with timestamp later than or equal to <code>minTimestamp</code> are
-     *                     requested.
-     * @param maxTimestamp If set, only elements with timestamp earlier than or equal to <code>maxTimestamp</code> are
-     *                     requested.
+     * @param componentID        If set, only results from the indicated component is requested.
+     * @param minTimestamp       If set, only elements with timestamp later than or equal to <code>minTimestamp</code> are
+     *                           requested.
+     * @param maxTimestamp       If set, only elements with timestamp earlier than or equal to <code>maxTimestamp</code> are
+     *                           requested.
      * @param maxNumberOfResults If set will limit the number of results returned. If the result set is limited, only
-     * the oldest timestamps are returned
+     *                           the oldest timestamps are returned
      */
     public ContributorQuery(String componentID, Date minTimestamp, Date maxTimestamp, Integer maxNumberOfResults) {
         if (minTimestamp != null && maxTimestamp != null && minTimestamp.after(maxTimestamp)) {
@@ -80,7 +79,7 @@ public Integer getMaxNumberOfResults() {
     @Override
     public String toString() {
         return getClass().getSimpleName() + "{" +
-                "componentID='" + componentID  +
+                "componentID='" + componentID +
                 "', minTimestamp=" + minTimestamp +
                 ", maxTimestamp=" + maxTimestamp +
                 ", maxNumberOfResults=" + maxNumberOfResults +
@@ -96,7 +95,7 @@ public int hashCode() {
         result = prime
                 * result
                 + ((maxNumberOfResults == null) ? 0 : maxNumberOfResults
-                        .hashCode());
+                .hashCode());
         result = prime * result
                 + ((maxTimestamp == null) ? 0 : maxTimestamp.hashCode());
         result = prime * result
@@ -129,10 +128,9 @@ public boolean equals(Object obj) {
         } else if (!maxTimestamp.equals(other.maxTimestamp))
             return false;
         if (minTimestamp == null) {
-            if (other.minTimestamp != null)
-                return false;
-        } else if (!minTimestamp.equals(other.minTimestamp))
-            return false;
-        return true;
+            return other.minTimestamp == null;
+        } else {
+            return minTimestamp.equals(other.minTimestamp);
+        }
     }
 }
diff --git a/bitrepository-client/src/main/java/org/bitrepository/access/ContributorQueryUtils.java b/bitrepository-client/src/main/java/org/bitrepository/access/ContributorQueryUtils.java
index 103a13b6c..5e17ad9a2 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/access/ContributorQueryUtils.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/access/ContributorQueryUtils.java
@@ -1,20 +1,20 @@
 package org.bitrepository.access;/*
  * #%L
- * Bitrepository Integrity Service
+ * BitRepository Integrity Service
  * %%
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -29,25 +29,27 @@ public class ContributorQueryUtils {
 
     /**
      * Used to create a <code>AuditTrailQuery[]</code> array in case no array is defined.
+     *
      * @param contributorIDs The collection of contributor IDs to create ContributorQueries for
-     * @return A <code>AuditTrailQuery[]</code> array requesting all audit trails from all the defined contributers.
+     * @return A <code>AuditTrailQuery[]</code> array requesting all audit trails from all the defined contributors.
      */
     public static ContributorQuery[] createFullContributorQuery(Collection<String> contributorIDs) {
         List<ContributorQuery> componentQueryList = new ArrayList<>(contributorIDs.size());
-        for (String contributer : contributorIDs) {
-            componentQueryList.add(new ContributorQuery(contributer, null, null, null));
+        for (String contributor : contributorIDs) {
+            componentQueryList.add(new ContributorQuery(contributor, null, null, null));
         }
-        return componentQueryList.toArray(new ContributorQuery[componentQueryList.size()]);
+        return componentQueryList.toArray(new ContributorQuery[0]);
     }
 
     /**
-     * Extracts the collection of ContributorIDs from the ContribytorQueries.
+     * Extracts the collection of ContributorIDs from the ContributorQueries.
+     *
      * @param queries The contributor queries to extract nonPillarContributors from
      * @return The list of ContributorIDs in the supplied queries
      */
     public static Collection<String> getContributors(ContributorQuery[] queries) {
         Collection<String> contributors = new HashSet<>();
-        for (ContributorQuery query: queries) {
+        for (ContributorQuery query : queries) {
             contributors.add(query.getComponentID());
         }
         return contributors;
diff --git a/bitrepository-client/src/main/java/org/bitrepository/access/getaudittrails/AuditTrailClient.java b/bitrepository-client/src/main/java/org/bitrepository/access/getaudittrails/AuditTrailClient.java
index 32cb3b3e0..6d855a6f7 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/access/getaudittrails/AuditTrailClient.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/access/getaudittrails/AuditTrailClient.java
@@ -1,43 +1,43 @@
 /*
  * #%L
  * Bitrepository Access
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.access.getaudittrails;
 
-import org.bitrepository.client.BitrepositoryClient;
+import org.bitrepository.client.BitRepositoryClient;
 import org.bitrepository.client.eventhandler.EventHandler;
 
-public interface AuditTrailClient extends BitrepositoryClient {
+public interface AuditTrailClient extends BitRepositoryClient {
     /**
-     * @param collectionID The collection to request audit trails for.
-     * @param componentQueries Defines which components to retrieve audit trail from. Also defines a filter which
-     *                         can be used to limit the audit trail result from each pillar. If null all audit trails
-     *                         from all contributers are returned.
-     * @param fileID The optional fileID to retrieve audit trails for. If <code>null</code> audit trail are retrieved for
-     *               all files.
-     * @param urlForResult If defined, the result is upload to this url (with a -componentID postfix) in stead of being
-     *                     returned in a completeEvent.
-     * @param eventHandler The handler which should receive notifications of the progress events.
+     * @param collectionID          The collection to request auditTrails for.
+     * @param componentQueries      Defines which components to retrieve auditTrail from. Also defines a filter which
+     *                              can be used to limit the auditTrail result from each pillar. If <code>null</code> all auditTrails
+     *                              from all contributors are returned.
+     * @param fileID                The optional fileID to retrieve audit trails for. If <code>null</code> auditTrails are retrieved for
+     *                              all files.
+     * @param urlForResult          If defined, the result is upload to the defined url (with a -componentID postfix) instead of being
+     *                              returned in a completeEvent.
+     * @param eventHandler          The handler which should receive notifications of the progress events.
      * @param auditTrailInformation The audit information for the given operation. E.g. who is behind the operation call.
      */
     void getAuditTrails(
diff --git a/bitrepository-client/src/main/java/org/bitrepository/access/getaudittrails/AuditTrailQuery.java b/bitrepository-client/src/main/java/org/bitrepository/access/getaudittrails/AuditTrailQuery.java
index 2c01a4c55..ee1a3186a 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/access/getaudittrails/AuditTrailQuery.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/access/getaudittrails/AuditTrailQuery.java
@@ -1,23 +1,23 @@
 /*
  * #%L
  * Bitrepository Access
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -35,34 +35,35 @@ public class AuditTrailQuery extends ContributorQuery {
 
     /**
      * Queries for all Audit Trails with sequence number between minSequenceNumber and maxSequenceNumber.
-     * @param componentID The ID of the component to query.
-     * @param minSequenceNumber Only return audit trail event with sequence number higher than <code>minSequenceNumber</code>.
-     * @param maxSequenceNumber Only return audit trail event with sequence number lower than <code>maxSequenceNumber</code>.
+     *
+     * @param componentID        The ID of the component to query.
+     * @param minSequenceNumber  Only return audit trail event with sequence number higher than <code>minSequenceNumber</code>.
+     * @param maxSequenceNumber  Only return audit trail event with sequence number lower than <code>maxSequenceNumber</code>.
      * @param maxNumberOfResults If set will limit the number of results returned. If the result set is limited, only
-     * the lowest sequence numbers are returned
+     *                           the lowest sequence numbers are returned
      */
     public AuditTrailQuery(String componentID, Long minSequenceNumber, Long maxSequenceNumber,
                            Integer maxNumberOfResults) {
-        super(componentID, null, null, maxNumberOfResults );
+        super(componentID, null, null, maxNumberOfResults);
         if (minSequenceNumber != null && maxSequenceNumber != null && minSequenceNumber > maxSequenceNumber)
             throw new IllegalArgumentException(
-                "minSequenceNumber=" + minSequenceNumber + " can not be greater than " +
-                "maxSequenceNumber=" + maxSequenceNumber);
+                    "minSequenceNumber=" + minSequenceNumber + " can not be greater than " +
+                            "maxSequenceNumber=" + maxSequenceNumber);
         this.minSequenceNumber = minSequenceNumber;
         this.maxSequenceNumber = maxSequenceNumber;
     }
 
     /**
-     * @see AuditTrailQuery#AuditTrailQuery(String, Long, Long, Integer)
      * @return the minimum sequence number
+     * @see AuditTrailQuery#AuditTrailQuery(String, Long, Long, Integer)
      */
     public Long getMinSequenceNumber() {
         return minSequenceNumber;
     }
 
     /**
-     * @see AuditTrailQuery#AuditTrailQuery(String, Long, Long, Integer)
      * @return the maximum sequence number
+     * @see AuditTrailQuery#AuditTrailQuery(String, Long, Long, Integer)
      */
     public Long getMaxSequenceNumber() {
         return maxSequenceNumber;
@@ -71,8 +72,8 @@ public Long getMaxSequenceNumber() {
     @Override
     public String toString() {
         return super.toString() +
-            "minSequenceNumber=" + minSequenceNumber +
-            ", maxSequenceNumber=" + maxSequenceNumber +
-            '}';
+                "minSequenceNumber=" + minSequenceNumber +
+                ", maxSequenceNumber=" + maxSequenceNumber +
+                '}';
     }
 }
diff --git a/bitrepository-client/src/main/java/org/bitrepository/access/getaudittrails/BlockingAuditTrailClient.java b/bitrepository-client/src/main/java/org/bitrepository/access/getaudittrails/BlockingAuditTrailClient.java
index fd5d411bb..177a1a2a6 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/access/getaudittrails/BlockingAuditTrailClient.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/access/getaudittrails/BlockingAuditTrailClient.java
@@ -24,15 +24,16 @@
  */
 package org.bitrepository.access.getaudittrails;
 
-import java.util.List;
 import org.bitrepository.client.eventhandler.BlockingEventHandler;
 import org.bitrepository.client.eventhandler.ContributorEvent;
 import org.bitrepository.client.eventhandler.EventHandler;
 import org.bitrepository.client.eventhandler.OperationEvent;
 import org.bitrepository.client.exceptions.NegativeResponseException;
 
+import java.util.List;
+
 /**
- * Wrappes a <code>PutFileClient</code> to provide a blocking client. The client will block until the PutFileOperation
+ * Wraps a <code>PutFileClient</code> to provide a blocking client. The client will block until the PutFileOperation
  * has finished.
  */
 public class BlockingAuditTrailClient {
diff --git a/bitrepository-client/src/main/java/org/bitrepository/access/getaudittrails/ConversationBasedAuditTrailClient.java b/bitrepository-client/src/main/java/org/bitrepository/access/getaudittrails/ConversationBasedAuditTrailClient.java
index 53a319eae..8db2e806f 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/access/getaudittrails/ConversationBasedAuditTrailClient.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/access/getaudittrails/ConversationBasedAuditTrailClient.java
@@ -1,33 +1,29 @@
 /*
  * #%L
  * Bitrepository Access
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.access.getaudittrails;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
 import org.bitrepository.access.ContributorQueryUtils;
 import org.bitrepository.access.getaudittrails.client.AuditTrailConversationContext;
 import org.bitrepository.access.getaudittrails.client.IdentifyingAuditTrailContributors;
@@ -39,53 +35,53 @@
 import org.bitrepository.common.utils.SettingsUtils;
 import org.bitrepository.protocol.messagebus.MessageBus;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
 /**
  * The conversation based implementation of the {@link AuditTrailClient}.
  */
 public class ConversationBasedAuditTrailClient extends AbstractClient implements AuditTrailClient {
 
-    public ConversationBasedAuditTrailClient(Settings settings, ConversationMediator conversationMediator, 
-            MessageBus messageBus, String clientID) {
+    public ConversationBasedAuditTrailClient(Settings settings, ConversationMediator conversationMediator, MessageBus messageBus,
+                                             String clientID) {
         super(settings, conversationMediator, messageBus, clientID);
     }
 
     @Override
-    public void getAuditTrails(
-            String collectionID,
-            AuditTrailQuery[] componentQueries,
-            String fileID,
-            String urlForResult,
-            EventHandler eventHandler, String auditTrailInformation) {
+    public void getAuditTrails(String collectionID, AuditTrailQuery[] componentQueries, String fileID, String urlForResult,
+                               EventHandler eventHandler, String auditTrailInformation) {
         ArgumentValidator.checkNotNullOrEmpty(collectionID, "collectionID");
         validateFileID(fileID);
         if (componentQueries == null) {
             componentQueries = createFullAuditTrailQuery(collectionID);
         }
-        AuditTrailConversationContext context = new AuditTrailConversationContext(
-                collectionID, componentQueries, fileID, urlForResult,
+        AuditTrailConversationContext context = new AuditTrailConversationContext(collectionID, componentQueries, fileID, urlForResult,
                 settings, messageBus, clientID, ContributorQueryUtils.getContributors(componentQueries), eventHandler,
-            auditTrailInformation);
+                auditTrailInformation);
         startConversation(context, new IdentifyingAuditTrailContributors(context));
     }
 
     /**
-     * Used to create a <code>AuditTrailQuery[]</code> array in case no array is defined.
-     * @param collectionID the collection ID
-     * @return A <code>AuditTrailQuery[]</code> array requesting all audit trails from all the defined contributers.
+     * Used to create an {@link AuditTrailQuery AuditTrailQuery[]} in case none is defined.
+     *
+     * @param collectionID The ID of the collection.
+     * @return An {@link AuditTrailQuery AuditTrailQuery[]} containing auditTrails from all the defined contributors.
      */
     private AuditTrailQuery[] createFullAuditTrailQuery(String collectionID) {
         if (settings.getRepositorySettings().getGetAuditTrailSettings() == null) {
             throw new IllegalStateException("Unable getAuditTrails both undefined GetAuditTrailSettings and undefined " +
                     "AuditTrailQuery[] in getAuditTrails call");
         } else if (SettingsUtils.getAuditContributorsForCollection(collectionID).isEmpty()) {
-            throw new IllegalStateException("Running AuditTrailClient without any defined contributers and undefined " +
+            throw new IllegalStateException("Running AuditTrailClient without any defined contributors and undefined " +
                     "AuditTrailQuery[] in getAuditTrails call.");
         }
-        Collection<String> contributers = SettingsUtils.getAuditContributorsForCollection(collectionID);
-        List<AuditTrailQuery> componentQueryList = new ArrayList<>(contributers.size());
-        for (String contributer : contributers) {
-            componentQueryList.add(new AuditTrailQuery(contributer, null, null, null));
+        Collection<String> contributors = SettingsUtils.getAuditContributorsForCollection(collectionID);
+        List<AuditTrailQuery> componentQueryList = new ArrayList<>(contributors.size());
+        for (String contributor : contributors) {
+            componentQueryList.add(new AuditTrailQuery(contributor, null, null, null));
         }
-        return componentQueryList.toArray(new AuditTrailQuery[componentQueryList.size()]);
+        return componentQueryList.toArray(new AuditTrailQuery[0]);
     }
 }
diff --git a/bitrepository-client/src/main/java/org/bitrepository/access/getaudittrails/client/AuditTrailConversationContext.java b/bitrepository-client/src/main/java/org/bitrepository/access/getaudittrails/client/AuditTrailConversationContext.java
index 4d889ef27..8e2699a51 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/access/getaudittrails/client/AuditTrailConversationContext.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/access/getaudittrails/client/AuditTrailConversationContext.java
@@ -5,24 +5,22 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.access.getaudittrails.client;
 
-import java.util.Collection;
-
 import org.bitrepository.access.getaudittrails.AuditTrailQuery;
 import org.bitrepository.client.conversation.ConversationContext;
 import org.bitrepository.client.eventhandler.EventHandler;
@@ -30,6 +28,8 @@
 import org.bitrepository.protocol.OperationType;
 import org.bitrepository.protocol.messagebus.MessageSender;
 
+import java.util.Collection;
+
 /**
  * models the conversation context for the {@link org.bitrepository.access.getaudittrails.AuditTrailClient}
  */
@@ -38,21 +38,23 @@ public class AuditTrailConversationContext extends ConversationContext {
     private final String urlForResult;
 
     /**
-     * Extends the {@link ConversationContext} constructor with {@link org.bitrepository.access.getaudittrails.AuditTrailClient} specific parameters
-     * @param collectionID The ID of the collection
-     * @param componentQueries The queries for the components
-     * @param fileID The fileID
-     * @param urlForResult The address to deliver results if delivery is requested by url
-     * @param settings The settings
-     * @param messageSender The MessageSender to send messages with
-     * @param clientID The ID of the client
-     * @param contributors The contributors in the conversation
-     * @param eventHandler The EventHandler handling incoming events
-     * @param auditTrailInformation Audit trail information for the components 
+     * Extends the {@link ConversationContext} constructor with {@link org.bitrepository.access.getaudittrails.AuditTrailClient} specific
+     * parameters
+     *
+     * @param collectionID          The ID of the collection
+     * @param componentQueries      The queries for the components
+     * @param fileID                The fileID (usually file name)
+     * @param urlForResult          The address to deliver results if delivery is requested by url
+     * @param settings              The settings
+     * @param messageSender         The MessageSender to send messages with
+     * @param clientID              The ID of the client
+     * @param contributors          The contributors in the conversation
+     * @param eventHandler          The EventHandler handling incoming events
+     * @param auditTrailInformation Audit trail information for the components
      */
     public AuditTrailConversationContext(
             String collectionID, AuditTrailQuery[] componentQueries, String fileID, String urlForResult,
-            Settings settings, MessageSender messageSender, String clientID, Collection<String> contributors, 
+            Settings settings, MessageSender messageSender, String clientID, Collection<String> contributors,
             EventHandler eventHandler, String auditTrailInformation) {
         super(collectionID, OperationType.GET_AUDIT_TRAILS, settings, messageSender, clientID, fileID,
                 contributors, eventHandler, auditTrailInformation);
@@ -61,14 +63,14 @@ public AuditTrailConversationContext(
     }
 
     /**
-     * @return The component queries 
+     * @return The component queries
      */
     public AuditTrailQuery[] getComponentQueries() {
         return componentQueries;
     }
 
     /**
-     * @return The URL for delivery of results  
+     * @return The URL for delivery of results
      */
     public String getUrlForResult() {
         return urlForResult;
diff --git a/bitrepository-client/src/main/java/org/bitrepository/access/getaudittrails/client/AuditTrailIdentificator.java b/bitrepository-client/src/main/java/org/bitrepository/access/getaudittrails/client/AuditTrailIdentificator.java
deleted file mode 100644
index e1abf543a..000000000
--- a/bitrepository-client/src/main/java/org/bitrepository/access/getaudittrails/client/AuditTrailIdentificator.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * #%L
- * Bitrepository Access
- * 
- * $Id$
- * $HeadURL$
- * %%
- * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
- * License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
- * License along with this program.  If not, see
- * <http://www.gnu.org/licenses/lgpl-2.1.html>.
- * #L%
- */
-package org.bitrepository.access.getaudittrails.client;
-
-import org.bitrepository.client.BitrepositoryClient;
-import org.bitrepository.client.eventhandler.EventHandler;
-
-/**
- * Provides functionality for retrieving the list of available audit trail contributors at a given time.
- */
-public interface AuditTrailIdentificator extends BitrepositoryClient {
-    /**
-     * Returns the contributors currently available. A identify contributors request is used to lookup the contributors 
-     * each time this method is called.
-     * @param eventHandler The EventHandler to handle incoming events
-     * @param auditTrailInformation The audittrail information to the components
-     */
-    void getAvailableContributors(EventHandler eventHandler, String auditTrailInformation);
-}
diff --git a/bitrepository-client/src/main/java/org/bitrepository/access/getaudittrails/client/AuditTrailResult.java b/bitrepository-client/src/main/java/org/bitrepository/access/getaudittrails/client/AuditTrailResult.java
index 1c2a595b0..0e92af0be 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/access/getaudittrails/client/AuditTrailResult.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/access/getaudittrails/client/AuditTrailResult.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -25,37 +25,37 @@
 import org.bitrepository.client.eventhandler.ContributorCompleteEvent;
 
 /**
- * Returns the result of a Audit Trail final response for a single contributor.
+ * Returns the result of an Audit Trail final response for a single contributor.
  */
 public class AuditTrailResult extends ContributorCompleteEvent {
     private final ResultingAuditTrails auditTrailEvents;
     private final boolean isPartialResult;
 
     /**
-     * @param pillarID The Id of the pillar suppying the audit trails.
-     * @param collectionID The ID of the collection
+     * @param pillarID         The ID of the pillar supplying the audit trails.
+     * @param collectionID     The ID of the collection
      * @param auditTrailEvents The list of audit trail events
-     * @param isPartialResult <code>true</code> if the result return encountered a maxResultLimit and therefore
-     * only returned a subset of results is returned. See {@link org.bitrepository.access.ContributorQuery} for
-     * details.
+     * @param isPartialResult  <code>true</code> if the result return encountered a maxResultLimit and therefore
+     *                         only returned a subset of results is returned. See {@link org.bitrepository.access.ContributorQuery} for
+     *                         details.
      */
-    public AuditTrailResult(String pillarID, String collectionID, ResultingAuditTrails auditTrailEvents, 
-            boolean isPartialResult) {
+    public AuditTrailResult(String pillarID, String collectionID, ResultingAuditTrails auditTrailEvents,
+                            boolean isPartialResult) {
         super(pillarID, collectionID);
         this.auditTrailEvents = auditTrailEvents;
         this.isPartialResult = isPartialResult;
     }
 
     /**
-     * @return The audit trails returned from the component.
+     * @return The auditTrails returned from the component.
      */
     public ResultingAuditTrails getAuditTrailEvents() {
         return auditTrailEvents;
     }
 
     /**
+     * @return An indication of the results being partial or not.
      * @see #AuditTrailResult(String, String, org.bitrepository.bitrepositoryelements.ResultingAuditTrails, boolean)
-     * @return indication if the results are partial
      */
     public boolean isPartialResult() {
         return isPartialResult;
@@ -64,12 +64,11 @@ public boolean isPartialResult() {
     @Override
     public String additionalInfo() {
         StringBuilder infoSB = new StringBuilder(super.additionalInfo());
-        if (auditTrailEvents != null && auditTrailEvents.getAuditTrailEvents() != null 
+        if (auditTrailEvents != null && auditTrailEvents.getAuditTrailEvents() != null
                 && auditTrailEvents.getAuditTrailEvents().getAuditTrailEvent() != null) {
-            infoSB.append(", NumberOfAuditTrailEvents=" +
-                    auditTrailEvents.getAuditTrailEvents().getAuditTrailEvent().size());
+            infoSB.append(", NumberOfAuditTrailEvents=").append(auditTrailEvents.getAuditTrailEvents().getAuditTrailEvent().size());
         }
-        infoSB.append(", PartialResult=" + isPartialResult);
+        infoSB.append(", PartialResult=").append(isPartialResult);
         return infoSB.toString();
     }
 }
diff --git a/bitrepository-client/src/main/java/org/bitrepository/access/getaudittrails/client/GettingAuditTrails.java b/bitrepository-client/src/main/java/org/bitrepository/access/getaudittrails/client/GettingAuditTrails.java
index ec7629196..84773da1d 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/access/getaudittrails/client/GettingAuditTrails.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/access/getaudittrails/client/GettingAuditTrails.java
@@ -5,25 +5,22 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.access.getaudittrails.client;
 
-import java.math.BigInteger;
-import java.util.Collection;
-
 import org.bitrepository.access.getaudittrails.AuditTrailQuery;
 import org.bitrepository.bitrepositorymessages.GetAuditTrailsFinalResponse;
 import org.bitrepository.bitrepositorymessages.GetAuditTrailsRequest;
@@ -31,13 +28,15 @@
 import org.bitrepository.client.conversation.ConversationContext;
 import org.bitrepository.client.conversation.PerformingOperationState;
 import org.bitrepository.client.conversation.selector.SelectedComponentInfo;
-import org.bitrepository.client.exceptions.UnexpectedResponseException;
+
+import java.math.BigInteger;
+import java.util.Collection;
 
 public class GettingAuditTrails extends PerformingOperationState {
     private final AuditTrailConversationContext context;
 
-    /*
-     * @param context The conversation context.
+    /**
+     * @param context      The conversation context.
      * @param contributors The list of components the audit trails should be collected from.
      */
     public GettingAuditTrails(AuditTrailConversationContext context, Collection<SelectedComponentInfo> contributors) {
@@ -45,10 +44,13 @@ public GettingAuditTrails(AuditTrailConversationContext context, Collection<Sele
         this.context = context;
     }
 
+    /**
+     * Sends the request for the auditTrails.
+     */
     @Override
     protected void sendRequest() {
         context.getMonitor().requestSent("Sending request for audit trails", activeContributors.keySet().toString());
-        for(AuditTrailQuery query : context.getComponentQueries()) {
+        for (AuditTrailQuery query : context.getComponentQueries()) {
             if (activeContributors.containsKey(query.getComponentID())) {
                 GetAuditTrailsRequest msg = new GetAuditTrailsRequest();
                 initializeMessage(msg);
@@ -58,26 +60,28 @@ protected void sendRequest() {
                 msg.setContributor(query.getComponentID());
                 msg.setDestination(activeContributors.get(query.getComponentID()));
                 if (query.getMinSequenceNumber() != null) {
-                    msg.setMinSequenceNumber(BigInteger.valueOf(query.getMinSequenceNumber().longValue()));
+                    msg.setMinSequenceNumber(BigInteger.valueOf(query.getMinSequenceNumber()));
                 }
                 if (query.getMaxSequenceNumber() != null) {
-                    msg.setMaxSequenceNumber(BigInteger.valueOf(query.getMaxSequenceNumber().longValue()));
+                    msg.setMaxSequenceNumber(BigInteger.valueOf(query.getMaxSequenceNumber()));
                 }
                 if (query.getMaxNumberOfResults() != null) {
-                    msg.setMaxNumberOfResults(BigInteger.valueOf(query.getMaxNumberOfResults().intValue()));
+                    msg.setMaxNumberOfResults(BigInteger.valueOf(query.getMaxNumberOfResults()));
                 }
                 context.getMessageSender().sendMessage(msg);
             }
         }
     }
 
+    /**
+     * @param msg The final response to process into result event.
+     */
     @Override
-    protected void generateContributorCompleteEvent(MessageResponse msg) throws UnexpectedResponseException {
-        GetAuditTrailsFinalResponse response = (GetAuditTrailsFinalResponse)msg;
-        boolean isPartialResult = response.isPartialResult() == null ? false : response.isPartialResult();
+    protected void generateContributorCompleteEvent(MessageResponse msg) {
+        GetAuditTrailsFinalResponse response = (GetAuditTrailsFinalResponse) msg;
+        boolean isPartialResult = response.isPartialResult() != null && response.isPartialResult();
         getContext().getMonitor().contributorComplete(
-                new AuditTrailResult(response.getFrom(), response.getCollectionID(), response.getResultingAuditTrails(), 
-                        isPartialResult));
+                new AuditTrailResult(response.getFrom(), response.getCollectionID(), response.getResultingAuditTrails(), isPartialResult));
     }
 
     @Override
diff --git a/bitrepository-client/src/main/java/org/bitrepository/access/getaudittrails/client/IdentifyingAuditTrailContributors.java b/bitrepository-client/src/main/java/org/bitrepository/access/getaudittrails/client/IdentifyingAuditTrailContributors.java
index e7a5f61d8..3977059d5 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/access/getaudittrails/client/IdentifyingAuditTrailContributors.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/access/getaudittrails/client/IdentifyingAuditTrailContributors.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -40,7 +40,7 @@ protected void sendRequest() {
         initializeMessage(msg);
         msg.setDestination(context.getSettings().getCollectionDestination());
         context.getMessageSender().sendMessage(msg);
-        context.getMonitor().identifyRequestSent("Identifying contributers for audit trails");
+        context.getMonitor().identifyRequestSent("Identifying contributors for audit trails");
     }
 
     @Override
diff --git a/bitrepository-client/src/main/java/org/bitrepository/access/getchecksums/BlockingGetChecksumsClient.java b/bitrepository-client/src/main/java/org/bitrepository/access/getchecksums/BlockingGetChecksumsClient.java
index cb1e04905..529006c8f 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/access/getchecksums/BlockingGetChecksumsClient.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/access/getchecksums/BlockingGetChecksumsClient.java
@@ -1,32 +1,29 @@
 /*
  * #%L
  * Bitmagasin modify client
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.access.getchecksums;
 
-import java.net.URL;
-import java.util.List;
-
 import org.bitrepository.access.ContributorQuery;
 import org.bitrepository.bitrepositoryelements.ChecksumSpecTYPE;
 import org.bitrepository.client.eventhandler.BlockingEventHandler;
@@ -35,8 +32,11 @@
 import org.bitrepository.client.eventhandler.OperationEvent;
 import org.bitrepository.client.exceptions.NegativeResponseException;
 
+import java.net.URL;
+import java.util.List;
+
 /**
- * Wrappes a <code>PutFileClient</code> to provide a blocking client. The client will block until the PutFileOperation
+ * Wraps a <code>PutFileClient</code> to provide a blocking client. The client will block until the PutFileOperation
  * has finished.
  */
 public class BlockingGetChecksumsClient {
@@ -47,26 +47,24 @@ public BlockingGetChecksumsClient(GetChecksumsClient client) {
     }
 
     /**
-     * @see GetChecksumsClient#getChecksums
-     * @param collectionID The ID of the collection
-     * @param contributorQueries The queries for the contributors
-     * @param fileID The ID of the file that the request is about
-     * @param checksumSpec The checksum specification for the file
-     * @param urlForResult The URL to deliver results
-     * @param eventHandler The EventHandler to handle incoming events
-     * @param auditTrailInformation The audittrail information for the components
+     * @param collectionID          The ID of the collection
+     * @param contributorQueries    The queries for the contributors
+     * @param fileID                The ID of the file that the request is about
+     * @param checksumSpec          The checksum specification for the file
+     * @param urlForResult          The URL to deliver results
+     * @param eventHandler          The EventHandler to handle incoming events
+     * @param auditTrailInformation The auditTrail information for the components
      * @return The list of ContributorEvents containing the results
-     * @throws NegativeResponseException in case of the operation fails. 
+     * @throws NegativeResponseException in case of the operation fails.
+     * @see GetChecksumsClient#getChecksums
      */
-    public List<ContributorEvent> getChecksums(String collectionID, ContributorQuery[] contributorQueries,
-        String fileID, ChecksumSpecTYPE checksumSpec, URL urlForResult, EventHandler eventHandler,
-        String auditTrailInformation) throws NegativeResponseException {
-
+    public List<ContributorEvent> getChecksums(String collectionID, ContributorQuery[] contributorQueries, String fileID,
+                                               ChecksumSpecTYPE checksumSpec, URL urlForResult, EventHandler eventHandler,
+                                               String auditTrailInformation) throws NegativeResponseException {
         BlockingEventHandler blocker = new BlockingEventHandler(eventHandler);
-        client.getChecksums(collectionID, contributorQueries, fileID, checksumSpec, urlForResult, blocker,
-                auditTrailInformation);
+        client.getChecksums(collectionID, contributorQueries, fileID, checksumSpec, urlForResult, blocker, auditTrailInformation);
         OperationEvent finishEvent = blocker.awaitFinished();
-        if(finishEvent.getEventType().equals(OperationEvent.OperationEventType.COMPLETE)) {
+        if (finishEvent.getEventType().equals(OperationEvent.OperationEventType.COMPLETE)) {
             return blocker.getResults();
         } else if (finishEvent.getEventType().equals(OperationEvent.OperationEventType.FAILED)) {
             throw new NegativeResponseException(finishEvent.getInfo(), null);
diff --git a/bitrepository-client/src/main/java/org/bitrepository/access/getchecksums/ConversationBasedGetChecksumsClient.java b/bitrepository-client/src/main/java/org/bitrepository/access/getchecksums/ConversationBasedGetChecksumsClient.java
index 5ad86483a..22f543d4e 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/access/getchecksums/ConversationBasedGetChecksumsClient.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/access/getchecksums/ConversationBasedGetChecksumsClient.java
@@ -1,23 +1,23 @@
 /*
  * #%L
  * bitrepository-access-client
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -45,19 +45,18 @@
 
 /**
  * The default <code>GetChecksumsClient</code>.
- *
- * This class is just a thin wrapper which creates a conversion each time a operation is started. The conversations 
- * takes over the rest of the operation handling.
+ * <p>
+ * This class is just a thin wrapper which creates a conversion each time an operation is started.
  */
 public class ConversationBasedGetChecksumsClient extends AbstractClient implements GetChecksumsClient {
     private final Logger log = LoggerFactory.getLogger(getClass());
 
     /**
-     * @see AbstractClient
-     * @param messageBus The MessageBus for communication
+     * @param messageBus           The MessageBus for communication
      * @param conversationMediator The ConversationMediator to keep track of conversations
-     * @param settings The Settings
-     * @param clientID The ID of the client
+     * @param settings             The Settings
+     * @param clientID             The ID of the client
+     * @see AbstractClient
      */
     public ConversationBasedGetChecksumsClient(MessageBus messageBus, ConversationMediator conversationMediator,
                                                Settings settings, String clientID) {
@@ -67,8 +66,8 @@ public ConversationBasedGetChecksumsClient(MessageBus messageBus, ConversationMe
 
     @Override
     public void getChecksums(String collectionID, ContributorQuery[] contributorQueries, String fileID,
-            ChecksumSpecTYPE checksumSpec, URL addressForResult, EventHandler eventHandler,
-            String auditTrailInformation) {
+                             ChecksumSpecTYPE checksumSpec, URL addressForResult, EventHandler eventHandler,
+                             String auditTrailInformation) {
         ArgumentValidator.checkNotNullOrEmpty(collectionID, "collectionID");
         MessageDataTypeValidator.validate(checksumSpec, "checksumSpec");
         validateFileID(fileID);
@@ -76,9 +75,9 @@ public void getChecksums(String collectionID, ContributorQuery[] contributorQuer
             contributorQueries = ContributorQueryUtils.createFullContributorQuery(
                     SettingsUtils.getPillarIDsForCollection(collectionID));
         }
-                
+
         log.info("Requesting the checksums for file '{}' with the specifications '{}' with query {}." +
-                (addressForResult != null ?  " The result should be uploaded to '{}'." : ""),
+                        (addressForResult != null ? " The result should be uploaded to '{}'." : ""),
                 fileID, checksumSpec, Arrays.asList(contributorQueries), addressForResult);
 
         GetChecksumsConversationContext context = new GetChecksumsConversationContext(collectionID,
diff --git a/bitrepository-client/src/main/java/org/bitrepository/access/getchecksums/GetChecksumsClient.java b/bitrepository-client/src/main/java/org/bitrepository/access/getchecksums/GetChecksumsClient.java
index d992d8a3f..04958e0cf 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/access/getchecksums/GetChecksumsClient.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/access/getchecksums/GetChecksumsClient.java
@@ -1,40 +1,40 @@
 /*
  * #%L
  * Bitrepository Access
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.access.getchecksums;
 
-import java.net.URL;
-
 import org.bitrepository.access.ContributorQuery;
 import org.bitrepository.bitrepositoryelements.ChecksumSpecTYPE;
-import org.bitrepository.client.BitrepositoryClient;
+import org.bitrepository.client.BitRepositoryClient;
 import org.bitrepository.client.eventhandler.EventHandler;
 
+import java.net.URL;
+
 /**
  * Used for retrieving checksums for files stored on the collection pillars.
  */
-public interface GetChecksumsClient extends BitrepositoryClient {
+public interface GetChecksumsClient extends BitRepositoryClient {
 
     /**
      * Retrieves the checksums for a set of files.
@@ -47,18 +47,19 @@ public interface GetChecksumsClient extends BitrepositoryClient {
      * <p>
      * The results are returned through as a ChecksumsCompletePillarCompete event as the results are returned by the
      * pillars.
-     * @param collectionID Identifies the collection to request checksums for.
-     * @param contributorQueries Defines which fileIDs to retrieve. If null all fileIDs from all contributers are
-     *                           returned.
-     * @param fileID The optional fileID to retrieve file information for. If <code>null</code> file information are
-     *               retrieved for all files.
-     * @param checksumSpec Specification of how the type of checksums. If no checksum spec is specified the default
-     * checksum type will be returned.
-     * @param addressForResult [OPTIONAL] The address to upload the calculated checksums to. If this is null, then the
-     * results will be retrieved through the message.
-     * @param eventHandler [OPTIONAL] The handler which should receive notifications of the events occurring in
-     * connection with the pillar communication.
-     * @param auditTrailInformation Audittrail information for the contributors
+     *
+     * @param collectionID          Identifies the collection to request checksums for.
+     * @param contributorQueries    Defines which fileIDs to retrieve. If null all fileIDs from all contributors are
+     *                              returned.
+     * @param fileID                The optional fileID to retrieve file information for. If <code>null</code> file information are
+     *                              retrieved for all files.
+     * @param checksumSpec          Specification of how the type of checksums. If no checksum spec is specified the default
+     *                              checksum type will be returned.
+     * @param addressForResult      [OPTIONAL] The address to upload the calculated checksums to. If this is null, then the
+     *                              results will be retrieved through the message.
+     * @param eventHandler          [OPTIONAL] The handler which should receive notifications of the events occurring in
+     *                              connection with the pillar communication.
+     * @param auditTrailInformation AuditTrail information for the contributors
      */
     void getChecksums(String collectionID, ContributorQuery[] contributorQueries, String fileID,
                       ChecksumSpecTYPE checksumSpec, URL addressForResult, EventHandler eventHandler,
diff --git a/bitrepository-client/src/main/java/org/bitrepository/access/getchecksums/conversation/ChecksumsCompletePillarEvent.java b/bitrepository-client/src/main/java/org/bitrepository/access/getchecksums/conversation/ChecksumsCompletePillarEvent.java
index 232da2f52..90ede07ab 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/access/getchecksums/conversation/ChecksumsCompletePillarEvent.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/access/getchecksums/conversation/ChecksumsCompletePillarEvent.java
@@ -1,23 +1,23 @@
 /*
  * #%L
  * Bitrepository Access
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -29,38 +29,35 @@
 import org.bitrepository.client.eventhandler.ContributorCompleteEvent;
 
 /**
-* Contains the result of a checksum request sent to a single pillar.
-*/
+ * Contains the result of a checksum request sent to a single pillar.
+ */
 public class ChecksumsCompletePillarEvent extends ContributorCompleteEvent {
-    /** @see #getChecksums(). */
     private final ResultingChecksums result;
-    /** @see #getChecksumType(). */
     private final ChecksumSpecTYPE checksumType;
-    /** Whether this complete event only contains a partail result set.*/
     private final boolean isPartialResult;
-    
+
     /**
-     * @param pillarID The pillar which generated the result
-     * @param collectionID The ID of the collection
-     * @param result The result returned by the pillar.
-     * @param checksumType The checksum specification type.
+     * @param pillarID        The pillar which generated the result
+     * @param collectionID    The ID of the collection
+     * @param result          The result returned by the pillar.
+     * @param checksumType    The checksum specification type.
      * @param isPartialResult Whether the complete event contains only a partial results set.
      */
-    public ChecksumsCompletePillarEvent(String pillarID, String collectionID, ResultingChecksums result, 
-            ChecksumSpecTYPE checksumType, boolean isPartialResult) {
+    public ChecksumsCompletePillarEvent(String pillarID, String collectionID, ResultingChecksums result,
+                                        ChecksumSpecTYPE checksumType, boolean isPartialResult) {
         super(pillarID, collectionID);
         this.result = result;
         this.checksumType = checksumType;
         this.isPartialResult = isPartialResult;
     }
 
-    /** 
-     * @return The checksum result from a single pillar. 
+    /**
+     * @return The checksum result from a single pillar.
      */
     public ResultingChecksums getChecksums() {
         return result;
     }
-    
+
     /**
      * @return The checksum calculation specifics (e.g. the algorithm and optionally salt).
      */
@@ -79,11 +76,10 @@ public boolean isPartialResult() {
     public String additionalInfo() {
         StringBuilder infoSB = new StringBuilder(super.additionalInfo());
         if (result != null && result.getChecksumDataItems() != null) {
-            infoSB.append(", NumberOfChecksums=" +
-                    result.getChecksumDataItems().size());
+            infoSB.append(", NumberOfChecksums=").append(result.getChecksumDataItems().size());
         }
 
-        infoSB.append(", PartialResult=" + isPartialResult);
+        infoSB.append(", PartialResult=").append(isPartialResult);
         return infoSB.toString();
     }
 }
diff --git a/bitrepository-client/src/main/java/org/bitrepository/access/getchecksums/conversation/GetChecksumsConversationContext.java b/bitrepository-client/src/main/java/org/bitrepository/access/getchecksums/conversation/GetChecksumsConversationContext.java
index 9006b2ac0..da338ab51 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/access/getchecksums/conversation/GetChecksumsConversationContext.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/access/getchecksums/conversation/GetChecksumsConversationContext.java
@@ -5,25 +5,22 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.access.getchecksums.conversation;
 
-import java.net.URL;
-import java.util.Collection;
-
 import org.bitrepository.access.ContributorQuery;
 import org.bitrepository.bitrepositoryelements.ChecksumSpecTYPE;
 import org.bitrepository.client.conversation.ConversationContext;
@@ -32,6 +29,9 @@
 import org.bitrepository.protocol.OperationType;
 import org.bitrepository.protocol.messagebus.MessageSender;
 
+import java.net.URL;
+import java.util.Collection;
+
 /**
  * Encapsulates the context for a GetChecksums operation.
  */
@@ -43,16 +43,17 @@ public class GetChecksumsConversationContext extends ConversationContext {
     /**
      * Extends the {@link ConversationContext} constructor with
      * {@link org.bitrepository.access.getchecksums.GetChecksumsClient} specific parameters.
-     * @param collectionID The ID of the collection
-     * @param contributorQueries See {@link org.bitrepository.access.getchecksums.GetChecksumsClient} for details.
-     * @param fileID The ID of the file to get checksums for
-     * @param checksumSpec See {@link org.bitrepository.access.getchecksums.GetChecksumsClient} for details.
-     * @param urlForResult See {@link org.bitrepository.access.getchecksums.GetChecksumsClient} for details.
-     * @param settings The settings
-     * @param messageSender The MessageSender to send messages with
-     * @param clientID The ID of the client
-     * @param contributors The contributors for the conversation
-     * @param eventHandler The EventHandler to handle incoming events
+     *
+     * @param collectionID          The ID of the collection
+     * @param contributorQueries    See {@link org.bitrepository.access.getchecksums.GetChecksumsClient} for details.
+     * @param fileID                The ID of the file to get checksums for
+     * @param checksumSpec          See {@link org.bitrepository.access.getchecksums.GetChecksumsClient} for details.
+     * @param urlForResult          See {@link org.bitrepository.access.getchecksums.GetChecksumsClient} for details.
+     * @param settings              The settings
+     * @param messageSender         The MessageSender to send messages with
+     * @param clientID              The ID of the client
+     * @param contributors          The contributors for the conversation
+     * @param eventHandler          The EventHandler to handle incoming events
      * @param auditTrailInformation The audittrail information for the contributors
      */
     public GetChecksumsConversationContext(
diff --git a/bitrepository-client/src/main/java/org/bitrepository/access/getchecksums/conversation/GettingChecksums.java b/bitrepository-client/src/main/java/org/bitrepository/access/getchecksums/conversation/GettingChecksums.java
index 2c500b3de..1bbb52c33 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/access/getchecksums/conversation/GettingChecksums.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/access/getchecksums/conversation/GettingChecksums.java
@@ -1,32 +1,29 @@
 /*
  * #%L
  * Bitrepository Access
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.access.getchecksums.conversation;
 
-import java.math.BigInteger;
-import java.util.Collection;
-
 import org.bitrepository.access.ContributorQuery;
 import org.bitrepository.bitrepositorymessages.GetChecksumsFinalResponse;
 import org.bitrepository.bitrepositorymessages.GetChecksumsRequest;
@@ -36,21 +33,25 @@
 import org.bitrepository.client.conversation.selector.SelectedComponentInfo;
 import org.bitrepository.client.exceptions.UnexpectedResponseException;
 import org.bitrepository.common.utils.CalendarUtils;
-import org.bitrepository.common.utils.FileIDsUtils;
+
+import java.math.BigInteger;
+import java.util.Collection;
+
+import static org.bitrepository.common.utils.FileIDsUtils.createFileIDs;
 
 /**
- * Models the behavior of a GetChecksums conversation during the operation phase. That is, it begins with the 
- * sending of <code>GetChecksumsRequest</code> messages and finishes with on the reception of the 
- * <code>GetChecksumsFinalResponse</code> messages from the responding pillars.
- * 
- * Note that this is only used by the GetChecksumsConversation in the same package, therefore the visibility is package 
+ * Models the behavior of a GetChecksums conversation during the operation phase. That is, it begins with the
+ * sending of {@link GetChecksumsRequest} messages and finishes with on the retrieval of the
+ * {@link GetChecksumsFinalResponse} messages from the responding pillars.
+ * <p/>
+ * Note that this is only used by the GetChecksumsConversation in the same package, therefore the visibility is package
  * protected.
  */
 public class GettingChecksums extends PerformingOperationState {
     private final GetChecksumsConversationContext context;
 
-    /*
-     * @param context The conversation context.
+    /**
+     * @param context      The conversation context.
      * @param contributors The list of components the checksums should be collected from.
      */
     public GettingChecksums(GetChecksumsConversationContext context, Collection<SelectedComponentInfo> contributors) {
@@ -62,27 +63,27 @@ public GettingChecksums(GetChecksumsConversationContext context, Collection<Sele
     protected void generateContributorCompleteEvent(MessageResponse msg) throws UnexpectedResponseException {
         if (msg instanceof GetChecksumsFinalResponse) {
             GetChecksumsFinalResponse response = (GetChecksumsFinalResponse) msg;
-            boolean isPartialResult = response.isPartialResult() == null ? false : response.isPartialResult();
+            boolean isPartialResult = response.isPartialResult() != null && response.isPartialResult();
             getContext().getMonitor().contributorComplete(new ChecksumsCompletePillarEvent(
                     response.getFrom(), response.getCollectionID(), response.getResultingChecksums(),
                     response.getChecksumRequestForExistingFile(), isPartialResult
-                    ));
+            ));
         } else {
             throw new UnexpectedResponseException("Received unexpected msg " + msg.getClass().getSimpleName() +
                     " while waiting for GetChecksums response.");
-        }        
+        }
     }
 
     @Override
     protected void sendRequest() {
         context.getMonitor().requestSent("Sending GetChecksumsRequest's", activeContributors.keySet().toString());
-        for(ContributorQuery query : context.getContributorQueries()) {
+        for (ContributorQuery query : context.getContributorQueries()) {
             if (activeContributors.containsKey(query.getComponentID())) {
                 GetChecksumsRequest msg = new GetChecksumsRequest();
                 initializeMessage(msg);
                 msg.setChecksumRequestForExistingFile(context.getChecksumSpec());
-                msg.setFileIDs(FileIDsUtils.createFileIDs(context.getFileID()));
-                if(context.getUrlForResult() != null) {
+                msg.setFileIDs(createFileIDs(context.getFileID()));
+                if (context.getUrlForResult() != null) {
                     msg.setResultAddress(context.getUrlForResult().toExternalForm() + "-" + query.getComponentID());
                 }
                 msg.setPillarID(query.getComponentID());
@@ -93,8 +94,9 @@ protected void sendRequest() {
                 }
                 if (query.getMaxTimestamp() != null) {
                     msg.setMaxTimestamp(CalendarUtils.getXmlGregorianCalendar(query.getMaxTimestamp()));
-                } if (query.getMaxNumberOfResults() != null) {
-                    msg.setMaxNumberOfResults(BigInteger.valueOf(query.getMaxNumberOfResults().intValue()));
+                }
+                if (query.getMaxNumberOfResults() != null) {
+                    msg.setMaxNumberOfResults(BigInteger.valueOf(query.getMaxNumberOfResults()));
                 }
                 context.getMessageSender().sendMessage(msg);
             }
@@ -110,5 +112,5 @@ protected ConversationContext getContext() {
     protected String getPrimitiveName() {
         return "GetChecksums";
     }
-    
+
 }
diff --git a/bitrepository-client/src/main/java/org/bitrepository/access/getfile/BlockingGetFileClient.java b/bitrepository-client/src/main/java/org/bitrepository/access/getfile/BlockingGetFileClient.java
index bbb8a2d7c..9b3063dcd 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/access/getfile/BlockingGetFileClient.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/access/getfile/BlockingGetFileClient.java
@@ -1,40 +1,40 @@
 /*
  * #%L
  * Bitmagasin modify client
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.access.getfile;
 
-import java.net.URL;
-
 import org.bitrepository.bitrepositoryelements.FilePart;
 import org.bitrepository.client.eventhandler.BlockingEventHandler;
 import org.bitrepository.client.eventhandler.EventHandler;
 import org.bitrepository.client.eventhandler.OperationEvent;
 import org.bitrepository.client.exceptions.NegativeResponseException;
 
+import java.net.URL;
+
 /**
- * Wrappes a <code>PutFileClient</code> to provide a blocking client. The client will block until the PutFileOperation
- * has finished.
+ * Wraps a {@link org.bitrepository.modify.putfile.PutFileClient} to provide a blocking client. The client will block until the
+ * PutFileOperation has finished.
  */
 public class BlockingGetFileClient {
     private final GetFileClient client;
@@ -44,60 +44,47 @@ public BlockingGetFileClient(GetFileClient client) {
     }
 
     /**
-     * @see GetFileClient#getFileFromFastestPillar
-     * @param collectionID The ID of the collection
-     * @param fileID The ID of the file to get
-     * @param filePart The FilePart specification if only requesting parts of a file
-     * @param uploadUrl The URL to upload the file to
-     * @param eventHandler The EventHandler to handle incoming events
-     * @param auditTrailInformation The audittrail information for the contributors
+     * @param collectionID          The ID of the collection
+     * @param fileID                The ID of the file to get
+     * @param filePart              The FilePart specification if only requesting parts of a file
+     * @param uploadUrl             The URL to upload the file to
+     * @param eventHandler          The EventHandler to handle incoming events
+     * @param auditTrailInformation The auditTrail information for the contributors
      * @throws NegativeResponseException in case the operation fails
+     * @see GetFileClient#getFileFromFastestPillar
      */
-    public void getFileFromFastestPillar(
-            String collectionID,
-            String fileID,
-            FilePart filePart,
-            URL uploadUrl,
-            EventHandler eventHandler,
-            String auditTrailInformation)
-            throws NegativeResponseException {
+    public void getFileFromFastestPillar(String collectionID, String fileID, FilePart filePart, URL uploadUrl, EventHandler eventHandler,
+                                         String auditTrailInformation) throws NegativeResponseException {
         BlockingEventHandler blocker = new BlockingEventHandler(eventHandler);
         client.getFileFromFastestPillar(collectionID, fileID, filePart, uploadUrl, blocker, auditTrailInformation);
         OperationEvent finishEvent = blocker.awaitFinished();
-        if(finishEvent.getEventType().equals(OperationEvent.OperationEventType.COMPLETE)) {
-            return;
-        } else if (finishEvent.getEventType().equals(OperationEvent.OperationEventType.FAILED)) {
+        if (finishEvent.getEventType().equals(OperationEvent.OperationEventType.FAILED)) {
             throw new NegativeResponseException(finishEvent.getInfo(), null);
-        } else throw new RuntimeException("Received unexpected event type" + finishEvent);
+        } else if (!finishEvent.getEventType().equals(OperationEvent.OperationEventType.COMPLETE)) {
+            throw new RuntimeException("Received unexpected event type" + finishEvent);
+        }
     }
 
     /**
-     * @see GetFileClient#getFileFromSpecificPillar
-     * @param collectionID The ID of the collection
-     * @param fileID The ID of the file to get
-     * @param filePart The FilePart specification if only requesting parts of a file
-     * @param uploadUrl The URL to upload the file to
-     * @param pillarID The ID of the specific pillar to get the file from
-     * @param eventHandler The EventHandler to handle incoming events
-     * @param auditTrailInformation The audittrail information for the contributors
+     * @param collectionID          The ID of the collection
+     * @param fileID                The ID of the file to get
+     * @param filePart              The FilePart specification if only requesting parts of a file
+     * @param uploadUrl             The URL to upload the file to
+     * @param pillarID              The ID of the specific pillar to get the file from
+     * @param eventHandler          The EventHandler to handle incoming events
+     * @param auditTrailInformation The auditTrail information for the contributors
      * @throws NegativeResponseException in case the operation fails
+     * @see GetFileClient#getFileFromSpecificPillar
      */
-    public void getFileFromSpecificPillar(
-            String collectionID,
-            String fileID,
-            FilePart filePart,
-            URL uploadUrl,
-            String pillarID,
-            EventHandler eventHandler,
-            String auditTrailInformation)
-            throws NegativeResponseException {
+    public void getFileFromSpecificPillar(String collectionID, String fileID, FilePart filePart, URL uploadUrl, String pillarID,
+                                          EventHandler eventHandler, String auditTrailInformation) throws NegativeResponseException {
         BlockingEventHandler blocker = new BlockingEventHandler(eventHandler);
         client.getFileFromSpecificPillar(collectionID, fileID, filePart, uploadUrl, pillarID, blocker, auditTrailInformation);
         OperationEvent finishEvent = blocker.awaitFinished();
-        if(finishEvent.getEventType().equals(OperationEvent.OperationEventType.COMPLETE)) {
-            return;
-        } else if (finishEvent.getEventType().equals(OperationEvent.OperationEventType.FAILED)) {
+        if (finishEvent.getEventType().equals(OperationEvent.OperationEventType.FAILED)) {
             throw new NegativeResponseException(finishEvent.getInfo(), null);
-        } else throw new RuntimeException("Received unexpected event type" + finishEvent);
+        } else if (!finishEvent.getEventType().equals(OperationEvent.OperationEventType.COMPLETE)) {
+            throw new RuntimeException("Received unexpected event type" + finishEvent);
+        }
     }
 }
diff --git a/bitrepository-client/src/main/java/org/bitrepository/access/getfile/ConversationBasedGetFileClient.java b/bitrepository-client/src/main/java/org/bitrepository/access/getfile/ConversationBasedGetFileClient.java
index fa4616ae0..165938ce6 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/access/getfile/ConversationBasedGetFileClient.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/access/getfile/ConversationBasedGetFileClient.java
@@ -1,23 +1,23 @@
 /*
  * #%L
  * Bitrepository Access Client
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -38,24 +38,23 @@
 import org.slf4j.LoggerFactory;
 
 import java.net.URL;
-import java.util.Arrays;
 import java.util.Collection;
+import java.util.List;
 
 /**
  * The default <code>GetFileClient</code>.
- * 
- * This class is just a thin wrapper which creates a conversion each time a operation is started. The conversations 
- * takes over the rest of the operation handling.
+ * <p>
+ * This class is just a thin wrapper which creates a conversion each time an operation is started.
  */
 public class ConversationBasedGetFileClient extends AbstractClient implements GetFileClient {
     private final Logger log = LoggerFactory.getLogger(getClass());
 
     /**
-     * @see AbstractClient
-     * @param messageBus The MessageBus for communication
+     * @param messageBus           The MessageBus for communication
      * @param conversationMediator The ConversationMediator to keep track of conversations
-     * @param settings The settings
-     * @param clientID The ID of the client
+     * @param settings             The settings
+     * @param clientID             The ID of the client
+     * @see AbstractClient
      */
     public ConversationBasedGetFileClient(MessageBus messageBus, ConversationMediator conversationMediator, Settings settings,
                                           String clientID) {
@@ -64,43 +63,73 @@ public ConversationBasedGetFileClient(MessageBus messageBus, ConversationMediato
         ArgumentValidator.checkNotNull(settings, "settings");
     }
 
+    /**
+     * Attempts to get the file fom the fastest pillar (decided using the pillars' timeToDeliver ID).
+     *
+     * @param collectionID          Identifies the collection the file should be retrieved from.
+     * @param fileID                The id of the file to retrieve.
+     * @param filePart              The part of the file, which is wanted. If null, then the whole file is retrieved.
+     * @param uploadUrl             The url the pillar should upload the file to.
+     * @param eventHandler          The handler which should receive notifications of the progress events.
+     * @param auditTrailInformation Additional information to add to the audit trail created because of this operation.
+     */
     @Override
-    public void getFileFromFastestPillar(String collectionID,
-            String fileID, FilePart filePart, URL uploadUrl, EventHandler eventHandler, String auditTrailInformation) {
+    public void getFileFromFastestPillar(String collectionID, String fileID, FilePart filePart, URL uploadUrl, EventHandler eventHandler,
+                                         String auditTrailInformation) {
         ArgumentValidator.checkNotNullOrEmpty(collectionID, "collectionID");
         ArgumentValidator.checkNotNull(fileID, "fileID");
         ArgumentValidator.checkNotNull(uploadUrl, "uploadUrl");
         ArgumentValidator.checkNotNull(eventHandler, "eventHandler");
         validateFileID(fileID);
-        
+
         log.info("Requesting the file '" + fileID + " from the fastest pillar");
-        getFile(collectionID, messageBus, settings, fileID, filePart,
-                SettingsUtils.getPillarIDsForCollection(collectionID), uploadUrl, eventHandler, auditTrailInformation);
+        getFile(collectionID, messageBus, settings, fileID, filePart, SettingsUtils.getPillarIDsForCollection(collectionID), uploadUrl,
+                eventHandler, auditTrailInformation);
     }
 
+    /**
+     * Attempts to get the file from a specific pillar.
+     *
+     * @param collectionID          Identifies the collection the file should be retrieved from.
+     * @param fileID                The id of the file to retrieve.
+     * @param filePart              The part of the file, which is wanted. If null, then the whole file is retrieved.
+     * @param uploadUrl             The url the pillar should upload the file to.
+     * @param pillarID              The id of pillar, where the file should be retrieved from.
+     * @param eventHandler          The handler which should receive notifications of the events occurring in connection with
+     *                              the pillar communication.
+     * @param auditTrailInformation Additional information to add to the audit trail created because of this operation.
+     */
     @Override
-    public void getFileFromSpecificPillar(String collectionID,
-            String fileID, FilePart filePart, URL uploadUrl, String pillarID, EventHandler eventHandler,
-            String auditTrailInformation) {
+    public void getFileFromSpecificPillar(String collectionID, String fileID, FilePart filePart, URL uploadUrl, String pillarID,
+                                          EventHandler eventHandler, String auditTrailInformation) {
         ArgumentValidator.checkNotNullOrEmpty(collectionID, "collectionID");
         ArgumentValidator.checkNotNull(fileID, "fileID");
         ArgumentValidator.checkNotNull(uploadUrl, "uploadUrl");
         ArgumentValidator.checkNotNullOrEmpty(pillarID, "pillarID");
         ArgumentValidator.checkNotNull(eventHandler, "eventHandler");
         validateFileID(fileID);
-        
+
         log.info("Requesting the file '" + fileID + "' from pillar '" + pillarID + "'.");
-        getFile(collectionID, messageBus, settings, fileID, filePart, Arrays.asList(pillarID),
-                uploadUrl, eventHandler, auditTrailInformation);
+        getFile(collectionID, messageBus, settings, fileID, filePart, List.of(pillarID), uploadUrl, eventHandler, auditTrailInformation);
     }
 
-    private void getFile(String collectionID, MessageBus messageBus, Settings settings,
-            String fileID, FilePart filePart, Collection<String> contributors, URL uploadUrl, EventHandler eventHandler,
-            String auditTrailInformation) {
-        GetFileConversationContext context = new GetFileConversationContext(collectionID,
-                fileID, uploadUrl, filePart, contributors, settings, messageBus, clientID, eventHandler,
-                auditTrailInformation
-        );
+    /**
+     * Starts a conversation with GetFileConversationContext which is created using the given parameters.
+     *
+     * @param collectionID          The ID of the collection.
+     * @param messageBus            The messageBus to use.
+     * @param settings              The settings.
+     * @param fileID                The ID of the file (usually the file-name).
+     * @param filePart              The {@link FilePart} if only a file-part is requested.
+     * @param contributors          A list of the contributors (pillars).
+     * @param uploadUrl             The URL to upload to.
+     * @param eventHandler          An EventHandler used to track the progress events, and await a final event.
+     * @param auditTrailInformation The information given to the AuditTrail.
+     */
+    private void getFile(String collectionID, MessageBus messageBus, Settings settings, String fileID, FilePart filePart,
+                         Collection<String> contributors, URL uploadUrl, EventHandler eventHandler, String auditTrailInformation) {
+        GetFileConversationContext context = new GetFileConversationContext(collectionID, fileID, uploadUrl, filePart, contributors,
+                settings, messageBus, clientID, eventHandler, auditTrailInformation);
         startConversation(context, new IdentifyingPillarsForGetFile(context));
     }
 }
diff --git a/bitrepository-client/src/main/java/org/bitrepository/access/getfile/GetFileClient.java b/bitrepository-client/src/main/java/org/bitrepository/access/getfile/GetFileClient.java
index 6a5a1a3b4..4f6585224 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/access/getfile/GetFileClient.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/access/getfile/GetFileClient.java
@@ -1,51 +1,50 @@
 /*
  * #%L
  * bitrepository-access-client
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.access.getfile;
 
-import java.net.URL;
-
 import org.bitrepository.bitrepositoryelements.FilePart;
-import org.bitrepository.client.BitrepositoryClient;
+import org.bitrepository.client.BitRepositoryClient;
 import org.bitrepository.client.eventhandler.EventHandler;
 
+import java.net.URL;
+
 /**
- * The <code>GetFileClient</code> is used as a handle for the Bit Repository getFile operation. 
- *
+ * The {@link GetFileClient} is used as a handle for the BitRepository <code>getFile</code> operation.
  */
-public interface GetFileClient extends BitrepositoryClient {
+public interface GetFileClient extends BitRepositoryClient {
 
     /**
-     * Method for retrieving a file from the pillar able to deliver the file fastest. 
-     *
-     * The method will return as soon as the communication has been setup.
+     * Method for retrieving a file from the pillar able to deliver the file fastest.
+     * <p>
+     * The method will return as soon as the communication has been initialized.
      *
-     * @param  collectionID Identifies the collection the file should be retrieved from.
-     * @param fileID The id of the file to retrieve.
-     * @param filePart The part of the file, which is wanted. If null, then the whole file is retrieved.
-     * @param uploadUrl The url the pillar should upload the file to.
-     * @param eventHandler The handler which should receive notifications of the progress events.
+     * @param collectionID          Identifies the collection the file should be retrieved from.
+     * @param fileID                The id of the file to retrieve.
+     * @param filePart              The part of the file, which is wanted. If null, then the whole file is retrieved.
+     * @param uploadUrl             The url the pillar should upload the file to.
+     * @param eventHandler          The handler which should receive notifications of the progress events.
      * @param auditTrailInformation Additional information to add to the audit trail created because of this operation.
      */
     void getFileFromFastestPillar(String collectionID, String fileID, FilePart filePart, URL uploadUrl,
@@ -53,16 +52,17 @@ void getFileFromFastestPillar(String collectionID, String fileID, FilePart fileP
                                   String auditTrailInformation);
 
     /**
-     * Method for retrieving a file from a specific pillar. 
+     * Method for retrieving a file from a specific pillar.
+     * <p>
+     * The method will return as soon as the communication has been initialized.
      *
-     * The method will return as soon as the communication has been setup.
-     * @param  collectionID Identifies the collection the file should be retrieved from.
-     * @param fileID The id of the file to retrieve.
-     * @param filePart The part of the file, which is wanted. If null, then the whole file is retrieved.
-     * @param uploadUrl The url the pillar should upload the file to.
-     * @param pillarID The id of pillar, where the file should be retrieved from.
-     * @param eventHandler The handler which should receive notifications of the events occurring in connection with 
-     * the pillar communication.
+     * @param collectionID          Identifies the collection the file should be retrieved from.
+     * @param fileID                The id of the file to retrieve.
+     * @param filePart              The part of the file, which is wanted. If null, then the whole file is retrieved.
+     * @param uploadUrl             The url the pillar should upload the file to.
+     * @param pillarID              The id of pillar, where the file should be retrieved from.
+     * @param eventHandler          The handler which should receive notifications of the events occurring in connection with
+     *                              the pillar communication.
      * @param auditTrailInformation Additional information to add to the audit trail created because of this operation.
      */
     void getFileFromSpecificPillar(String collectionID, String fileID, FilePart filePart, URL uploadUrl,
diff --git a/bitrepository-client/src/main/java/org/bitrepository/access/getfile/conversation/GetFileConversationContext.java b/bitrepository-client/src/main/java/org/bitrepository/access/getfile/conversation/GetFileConversationContext.java
index 07afe1eac..19356921f 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/access/getfile/conversation/GetFileConversationContext.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/access/getfile/conversation/GetFileConversationContext.java
@@ -5,24 +5,22 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.access.getfile.conversation;
 
-import java.net.URL;
-import java.util.Collection;
 import org.bitrepository.bitrepositoryelements.FilePart;
 import org.bitrepository.client.conversation.ConversationContext;
 import org.bitrepository.client.eventhandler.EventHandler;
@@ -30,30 +28,33 @@
 import org.bitrepository.protocol.OperationType;
 import org.bitrepository.protocol.messagebus.MessageSender;
 
+import java.net.URL;
+import java.util.Collection;
+
 /**
  * The context for the conversation for the GetFile operation.
  */
 public class GetFileConversationContext extends ConversationContext {
-    private FilePart filePart;
+    private final FilePart filePart;
     private final URL urlForResult;
 
     /**
-     * @see ConversationContext for general parameter documentation.
-     * @param collectionID The ID of the collection
-     * @param fileID The ID of the file
-     * @param urlForResult The URL to deliver the results to
-     * @param filePart The part of the file. Null if whole file is wanted.
-     * @param contributors The contributors used in the conversation
-     * @param settings The settings 
-     * @param messageSender The MessageSender for sending messages
-     * @param clientID The ID of the client
-     * @param eventHandler The EventHandler for handling incoming events
+     * @param collectionID          The ID of the collection
+     * @param fileID                The ID of the file
+     * @param urlForResult          The URL to deliver the results to
+     * @param filePart              The part of the file. Null if whole file is wanted.
+     * @param contributors          The contributors used in the conversation
+     * @param settings              The settings
+     * @param messageSender         The MessageSender for sending messages
+     * @param clientID              The ID of the client
+     * @param eventHandler          The EventHandler for handling incoming events
      * @param auditTrailInformation The audittrail information for the contributors
+     * @see ConversationContext for general parameter documentation.
      */
     public GetFileConversationContext(String collectionID,
-            String fileID, URL urlForResult, FilePart filePart, Collection<String> contributors,
-            Settings settings, MessageSender messageSender, String clientID, EventHandler eventHandler,
-            String auditTrailInformation) {
+                                      String fileID, URL urlForResult, FilePart filePart, Collection<String> contributors,
+                                      Settings settings, MessageSender messageSender, String clientID, EventHandler eventHandler,
+                                      String auditTrailInformation) {
         super(collectionID, OperationType.GET_FILE, settings, messageSender, clientID, fileID, contributors,
                 eventHandler, auditTrailInformation);
         this.filePart = filePart;
@@ -66,7 +67,7 @@ public GetFileConversationContext(String collectionID,
     public FilePart getFilePart() {
         return filePart;
     }
-    
+
     /**
      * @return The URL for the results to be delivered.
      */
diff --git a/bitrepository-client/src/main/java/org/bitrepository/access/getfile/conversation/GettingFile.java b/bitrepository-client/src/main/java/org/bitrepository/access/getfile/conversation/GettingFile.java
index c3508efed..59bd4a63b 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/access/getfile/conversation/GettingFile.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/access/getfile/conversation/GettingFile.java
@@ -1,31 +1,29 @@
 /*
  * #%L
  * Bitrepository Access
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.access.getfile.conversation;
 
-import java.util.Collection;
-import java.util.HashSet;
 import org.bitrepository.bitrepositorymessages.GetFileRequest;
 import org.bitrepository.bitrepositorymessages.MessageResponse;
 import org.bitrepository.client.conversation.ConversationContext;
@@ -34,26 +32,30 @@
 import org.bitrepository.client.eventhandler.ContributorCompleteEvent;
 import org.bitrepository.common.exceptions.UnableToFinishException;
 
+import java.util.Collection;
+import java.util.HashSet;
+
 /**
  * Models the behavior of a GetFile conversation during the file exchange phase. That is, it begins with the sending of
  * a <code>GetFileRequest</code> and finishes with on the reception of a <code>GetFileFinalResponse</code> message.
- * 
- * Note that this is only used by the GetFileConversation in the same package, therefore the visibility is package 
+ * <p>
+ * Note that this is only used by the GetFileConversation in the same package, therefore the visibility is package
  * protected.
  */
 class GettingFile extends PerformingOperationState {
     private final GetFileConversationContext context;
     private final SelectedComponentInfo selectedPillar;
+    private final Collection<String> contributors;
 
     /**
      * @param context The related conversation containing context information.
-     * @param pillar The pillar the file should be requested from.
+     * @param pillar  The pillar the file should be requested from.
      */
     public GettingFile(GetFileConversationContext context, SelectedComponentInfo pillar) {
         super(pillar.getID());
         this.context = context;
         this.selectedPillar = pillar;
-        Collection<String> contributors = new HashSet<>();
+        contributors = new HashSet<>();
         contributors.add(pillar.getID());
     }
 
@@ -72,10 +74,9 @@ protected void sendRequest() {
 
     @Override
     protected boolean handleFailureResponse(MessageResponse msg) throws UnableToFinishException {
-        getContext().getMonitor().contributorFailed(
-                msg.getResponseInfo().getResponseText(), msg.getFrom(), msg.getResponseInfo().getResponseCode());
-        throw new UnableToFinishException("Failed to get file from " + msg.getFrom() +
-                ", " + msg.getResponseInfo());
+        getContext().getMonitor()
+                .contributorFailed(msg.getResponseInfo().getResponseText(), msg.getFrom(), msg.getResponseInfo().getResponseCode());
+        throw new UnableToFinishException("Failed to get file from " + msg.getFrom() + ", " + msg.getResponseInfo());
     }
 
     @Override
@@ -87,9 +88,13 @@ protected void generateContributorCompleteEvent(MessageResponse msg) {
     protected ConversationContext getContext() {
         return context;
     }
-     
+
     @Override
     protected String getPrimitiveName() {
         return "GetFile";
     }
+
+    protected Collection<String> getContributors() {
+        return contributors;
+    }
 }
diff --git a/bitrepository-client/src/main/java/org/bitrepository/access/getfile/conversation/IdentifyingPillarsForGetFile.java b/bitrepository-client/src/main/java/org/bitrepository/access/getfile/conversation/IdentifyingPillarsForGetFile.java
index d9a08a0e8..b3e9182b2 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/access/getfile/conversation/IdentifyingPillarsForGetFile.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/access/getfile/conversation/IdentifyingPillarsForGetFile.java
@@ -1,23 +1,23 @@
 /*
  * #%L
  * Bitrepository Access
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -38,8 +38,9 @@
 public class IdentifyingPillarsForGetFile extends IdentifyingState {
     private final GetFileConversationContext context;
 
-    /** 
+    /**
      * The constructor for the indicated conversation.
+     *
      * @param context The related context related to the conversation containing information.
      */
     public IdentifyingPillarsForGetFile(GetFileConversationContext context) {
@@ -65,7 +66,7 @@ protected void sendRequest() {
         msg.setFileID(context.getFileID());
         context.getMessageSender().sendMessage(msg);
         context.getMonitor().identifyRequestSent("Identifying pillars for GetFile");
-        
+
     }
 
     @Override
@@ -79,7 +80,7 @@ protected String getPrimitiveName() {
     }
 
     /**
-     * @return  the single selected pillar fron the generic selector's SelectedComponents list.
+     * @return the single selected pillar from the generic selector's SelectedComponents list.
      */
     private SelectedComponentInfo getSelectedPillar() {
         return getSelector().getSelectedComponents().iterator().next();
diff --git a/bitrepository-client/src/main/java/org/bitrepository/access/getfile/selectors/FastestPillarSelectorForGetFile.java b/bitrepository-client/src/main/java/org/bitrepository/access/getfile/selectors/FastestPillarSelectorForGetFile.java
index 67064ccaa..64cd19187 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/access/getfile/selectors/FastestPillarSelectorForGetFile.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/access/getfile/selectors/FastestPillarSelectorForGetFile.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -29,16 +29,16 @@
 import org.bitrepository.common.utils.TimeMeasurementUtils;
 
 /**
- * GetFile specific selector for situations, when the getFile can chose between multiple pillars. The selector will
- * chose the pillar able to return a file fastest, eg. the timeToDeliver id is the smallest.
+ * GetFile specific selector for situations where the GetFile method can choose between multiple pillars. The selector will
+ * choose the pillar able to return the file fastest, i.e. where the <cod>timeToDeliver</cod> ID is the smallest.
  */
 public class FastestPillarSelectorForGetFile extends ComponentSelector {
     private TimeMeasureTYPE fastestTimeToDeliver;
 
-   @Override
+    @Override
     public synchronized void selectComponent(MessageResponse message) throws UnexpectedResponseException {
-        IdentifyPillarsForGetFileResponse response = (IdentifyPillarsForGetFileResponse)message;
-        if (fastestTimeToDeliver == null ) {
+        IdentifyPillarsForGetFileResponse response = (IdentifyPillarsForGetFileResponse) message;
+        if (fastestTimeToDeliver == null) {
             fastestTimeToDeliver = response.getTimeToDeliver();
         }
         if (isFaster(response)) {
diff --git a/bitrepository-client/src/main/java/org/bitrepository/access/getfile/selectors/SelectedPillarForGetFileInfo.java b/bitrepository-client/src/main/java/org/bitrepository/access/getfile/selectors/SelectedPillarForGetFileInfo.java
deleted file mode 100644
index 6e6e25800..000000000
--- a/bitrepository-client/src/main/java/org/bitrepository/access/getfile/selectors/SelectedPillarForGetFileInfo.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * #%L
- * Bitrepository Access
- * %%
- * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
- * License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
- * License along with this program.  If not, see
- * <http://www.gnu.org/licenses/lgpl-2.1.html>.
- * #L%
- */
-package org.bitrepository.access.getfile.selectors;
-
-import org.bitrepository.bitrepositoryelements.TimeMeasureTYPE;
-import org.bitrepository.client.conversation.selector.SelectedComponentInfo;
-
-/**
- * Container for information about a pillar which as been identified and are marked as 
- * selected for a GetFile request.
- */
-public class SelectedPillarForGetFileInfo extends SelectedComponentInfo {
-    /** @see #getTimeToDeliver() */
-    private final TimeMeasureTYPE timeToDeliver;       
-    
-    /** 
-     * Delegates to SelectedPillarInfo construct.
-     * @see #getTimeToDeliver() 
-     * @param pillarID The ID of the pillar
-     * @param pillarTopic The pillar specific topic
-     * @param timeToDeliver The time the pillar is to start delivery
-     */
-    public SelectedPillarForGetFileInfo(String pillarID, String pillarTopic, TimeMeasureTYPE timeToDeliver) {
-        super(pillarID, pillarTopic);
-        this.timeToDeliver = timeToDeliver;
-    }
-
-    /**
-     * @return The estimated time to deliver for the selected pillar as specified in the identify response.
-     */
-    public TimeMeasureTYPE getTimeToDeliver() {
-        return timeToDeliver;
-    }
-}
\ No newline at end of file
diff --git a/bitrepository-client/src/main/java/org/bitrepository/access/getfileids/BlockingGetFileIDsClient.java b/bitrepository-client/src/main/java/org/bitrepository/access/getfileids/BlockingGetFileIDsClient.java
index c1022fc73..af39f2280 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/access/getfileids/BlockingGetFileIDsClient.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/access/getfileids/BlockingGetFileIDsClient.java
@@ -1,32 +1,29 @@
 /*
  * #%L
  * Bitmagasin modify client
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.access.getfileids;
 
-import java.net.URL;
-import java.util.List;
-
 import org.bitrepository.access.ContributorQuery;
 import org.bitrepository.client.eventhandler.BlockingEventHandler;
 import org.bitrepository.client.eventhandler.ContributorEvent;
@@ -34,8 +31,11 @@
 import org.bitrepository.client.eventhandler.OperationEvent;
 import org.bitrepository.client.exceptions.NegativeResponseException;
 
+import java.net.URL;
+import java.util.List;
+
 /**
- * Wrappes a <code>PutFileClient</code> to provide a blocking client. The client will block until the PutFileOperation
+ * Wraps a <code>PutFileClient</code> to provide a blocking client. The client will block until the PutFileOperation
  * has finished.
  */
 public class BlockingGetFileIDsClient {
@@ -46,26 +46,21 @@ public BlockingGetFileIDsClient(GetFileIDsClient client) {
     }
 
     /**
-     * @see GetFileIDsClient#getFileIDs
-     * @param collectionID The ID of the collection
+     * @param collectionID       The ID of the collection
      * @param contributorQueries The {@link ContributorQuery} for the GetFileIDs request
-     * @param fileID The ID of the file that the request is about
-     * @param addressForResult The address of where to deliver the result
-     * @param eventHandler The event handler to handle incoming events
-     * @return The list of {@link ContributorEvent}'s 
+     * @param fileID             The ID of the file that the request is about
+     * @param addressForResult   The address of where to deliver the result
+     * @param eventHandler       The event handler to handle incoming events
+     * @return The list of {@link ContributorEvent}'s
      * @throws NegativeResponseException if the operation failed
+     * @see GetFileIDsClient#getFileIDs
      */
-    public List<ContributorEvent> getGetFileIDs(
-            String collectionID,
-            ContributorQuery[] contributorQueries,
-            String fileID,
-            URL addressForResult,
-            EventHandler eventHandler)
-            throws NegativeResponseException {
+    public List<ContributorEvent> getGetFileIDs(String collectionID, ContributorQuery[] contributorQueries, String fileID,
+                                                URL addressForResult, EventHandler eventHandler) throws NegativeResponseException {
         BlockingEventHandler blocker = new BlockingEventHandler(eventHandler);
         client.getFileIDs(collectionID, contributorQueries, fileID, addressForResult, blocker);
         OperationEvent finishEvent = blocker.awaitFinished();
-        if(finishEvent.getEventType().equals(OperationEvent.OperationEventType.COMPLETE)) {
+        if (finishEvent.getEventType().equals(OperationEvent.OperationEventType.COMPLETE)) {
             return blocker.getResults();
         } else if (finishEvent.getEventType().equals(OperationEvent.OperationEventType.FAILED)) {
             throw new NegativeResponseException(finishEvent.getInfo(), null);
diff --git a/bitrepository-client/src/main/java/org/bitrepository/access/getfileids/ConversationBasedGetFileIDsClient.java b/bitrepository-client/src/main/java/org/bitrepository/access/getfileids/ConversationBasedGetFileIDsClient.java
index 7950e05a6..07b1e2d4b 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/access/getfileids/ConversationBasedGetFileIDsClient.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/access/getfileids/ConversationBasedGetFileIDsClient.java
@@ -1,23 +1,23 @@
 /*
  * #%L
  * Bitrepository Access
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -44,46 +44,38 @@
 /**
  * The reference implementation of the client side of the GetFileIDs identification and operation.
  * The default <code>GetFileIDsClient</code>
- *
- * This class is just a thin wrapper which creates a conversion each time a operation is started. The conversations 
- * takes over the rest of the operation handling.
+ * <p>
+ * This class is just a thin wrapper which creates a conversion each time a operation is started.
  */
 public class ConversationBasedGetFileIDsClient extends AbstractClient implements GetFileIDsClient {
     private final Logger log = LoggerFactory.getLogger(getClass());
 
     /**
-     * @see AbstractClient
-     * @param messageBus The message bus used in the communication
+     * @param messageBus           The message bus used in the communication
      * @param conversationMediator The {@link ConversationMediator} used to keep track of conversations
-     * @param settings The settings for the client
-     * @param clientID The ID of the client
+     * @param settings             The settings for the client
+     * @param clientID             The ID of the client
+     * @see AbstractClient
      */
-    public ConversationBasedGetFileIDsClient(MessageBus messageBus, ConversationMediator conversationMediator,
-                                             Settings settings, String clientID) {
+    public ConversationBasedGetFileIDsClient(MessageBus messageBus, ConversationMediator conversationMediator, Settings settings,
+                                             String clientID) {
         super(settings, conversationMediator, messageBus, clientID);
     }
 
     @Override
-    public void getFileIDs(
-            String collectionID,
-            ContributorQuery[] contributorQueries,
-            String fileID,
-            URL addressForResult,
-            EventHandler eventHandler) {
+    public void getFileIDs(String collectionID, ContributorQuery[] contributorQueries, String fileID, URL addressForResult,
+                           EventHandler eventHandler) {
         ArgumentValidator.checkNotNullOrEmpty(collectionID, "collectionID");
         validateFileID(fileID);
         if (contributorQueries == null) {
-            contributorQueries = ContributorQueryUtils.createFullContributorQuery(
-                    SettingsUtils.getPillarIDsForCollection(collectionID));
+            contributorQueries = ContributorQueryUtils.createFullContributorQuery(SettingsUtils.getPillarIDsForCollection(collectionID));
         }
 
-        log.info("Requesting the fileIDs for file '" + fileID + "' with query "+
-                Arrays.asList(contributorQueries) + ". " +
-                (addressForResult != null ?  "The result should be uploaded to '" + addressForResult + "'." : ""));
+        log.info("Requesting the fileIDs for file '" + fileID + "' with query " + Arrays.asList(contributorQueries) + ". " +
+                (addressForResult != null ? "The result should be uploaded to '" + addressForResult + "'." : ""));
 
-        GetFileIDsConversationContext context = new GetFileIDsConversationContext(
-                collectionID, contributorQueries, fileID, addressForResult, settings, messageBus, clientID,
-                ContributorQueryUtils.getContributors(contributorQueries), eventHandler);
+        GetFileIDsConversationContext context = new GetFileIDsConversationContext(collectionID, contributorQueries, fileID,
+                addressForResult, settings, messageBus, clientID, ContributorQueryUtils.getContributors(contributorQueries), eventHandler);
 
         startConversation(context, new IdentifyPillarsForGetFileIDs(context));
     }
diff --git a/bitrepository-client/src/main/java/org/bitrepository/access/getfileids/GetFileIDsClient.java b/bitrepository-client/src/main/java/org/bitrepository/access/getfileids/GetFileIDsClient.java
index 91776c1ed..c924220c4 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/access/getfileids/GetFileIDsClient.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/access/getfileids/GetFileIDsClient.java
@@ -8,32 +8,32 @@
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.access.getfileids;
 
-import java.net.URL;
-
 import org.bitrepository.access.ContributorQuery;
 import org.bitrepository.client.eventhandler.EventHandler;
 
+import java.net.URL;
+
 /**
- * Interface for GetFileIDs client exposing the bit repository org.bitrepository.org.bitrepository.protocol GetFileIDs functionality.
+ * Interface for GetFileIDs client exposing the GetFileIDs functionality.
  */
 public interface GetFileIDsClient {
-    
+
     /**
      * Method for requesting a given list of FileIDs from the pillars. Thus requesting validation of the existence of
      * the files at the given pillars.
@@ -46,21 +46,17 @@ public interface GetFileIDsClient {
      * Since every pillar cannot upload their fileids to the same URL, it is extended with the pillarID for the given
      * pillar, e.g.: 'http://upload.url/mypath' + '-pillarID'.
      * <p>
-     * The results are returned through as an special event through the eventHandler, the FileIDsCompletePillarCompete. 
+     * The results are returned through as an special event through the eventHandler, the FileIDsCompletePillarCompete.
      *
-     * @param collectionID Identifies the collection the fileIDs should be retrived from.
-     * @param contributorQueries Defines which fileIDs to retrieve. If null all fileIDs from all contributers are
+     * @param collectionID       Identifies the collection the fileIDs should be retrieved from.
+     * @param contributorQueries Defines which fileIDs to retrieve. If null all fileIDs from all contributors are
      *                           returned. Note that
-     * @param fileID The optional fileID to retrieve file information for. If <code>null</code> file information are
-     *               retrieved for all files.
-     * @param addressForResult The address for delivering the results of the operation. If this is null, then it is 
-     * returned through the messages.
-     * @param eventHandler The eventHandler to keep track of the operation.
+     * @param fileID             The optional fileID to retrieve file information for. If <code>null</code> file information are
+     *                           retrieved for all files.
+     * @param addressForResult   The address for delivering the results of the operation. If this is null, then it is
+     *                           returned through the messages.
+     * @param eventHandler       The eventHandler to keep track of the operation.
      */
-    void getFileIDs(
-        String collectionID,
-        ContributorQuery[] contributorQueries,
-        String fileID,
-        URL addressForResult,
-        EventHandler eventHandler);
+    void getFileIDs(String collectionID, ContributorQuery[] contributorQueries, String fileID, URL addressForResult,
+                    EventHandler eventHandler);
 }
diff --git a/bitrepository-client/src/main/java/org/bitrepository/access/getfileids/conversation/FileIDsCompletePillarEvent.java b/bitrepository-client/src/main/java/org/bitrepository/access/getfileids/conversation/FileIDsCompletePillarEvent.java
index 64ef2debd..0963f3440 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/access/getfileids/conversation/FileIDsCompletePillarEvent.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/access/getfileids/conversation/FileIDsCompletePillarEvent.java
@@ -1,23 +1,23 @@
 /*
  * #%L
  * Bitrepository Access
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -28,17 +28,16 @@
 import org.bitrepository.client.eventhandler.ContributorCompleteEvent;
 
 /**
-* Contains the result of a GetFileIDs request sent to a single pillar.
-*/
+ * Contains the result of a GetFileIDs request sent to a single pillar.
+ */
 public class FileIDsCompletePillarEvent extends ContributorCompleteEvent {
-    /** The result from the pillar.*/
-    private final ResultingFileIDs result;
+    private final ResultingFileIDs result; // The Result from the pillar.
     private final boolean isPartialResult;
 
     /**
-     * @param pillarID The pillar which generated the result
-     * @param collectionID The ID of the collection
-     * @param result The result returned by the pillar.
+     * @param pillarID        The pillar which generated the result
+     * @param collectionID    The ID of the collection
+     * @param result          The result returned by the pillar.
      * @param isPartialResult Indication if the event contains partial results
      */
     public FileIDsCompletePillarEvent(String pillarID, String collectionID, ResultingFileIDs result, boolean isPartialResult) {
@@ -55,7 +54,7 @@ public ResultingFileIDs getFileIDs() {
     }
 
     /**
-     * @return Indication if the results are partial 
+     * @return Indication if the results are partial
      */
     public boolean isPartialResult() {
         return isPartialResult;
@@ -66,11 +65,10 @@ public String additionalInfo() {
         StringBuilder infoSB = new StringBuilder(super.additionalInfo());
 
         if (result != null && result.getFileIDsData() != null) {
-            infoSB.append(", NumberOfFileIDs=" +
-                    result.getFileIDsData().getFileIDsDataItems().getFileIDsDataItem().size());
+            infoSB.append(", NumberOfFileIDs=").append(result.getFileIDsData().getFileIDsDataItems().getFileIDsDataItem().size());
         }
 
-        infoSB.append(", PartialResult=" + isPartialResult);
+        infoSB.append(", PartialResult=").append(isPartialResult);
         return infoSB.toString();
     }
 }
diff --git a/bitrepository-client/src/main/java/org/bitrepository/access/getfileids/conversation/GetFileIDsConversationContext.java b/bitrepository-client/src/main/java/org/bitrepository/access/getfileids/conversation/GetFileIDsConversationContext.java
index c896706bf..c3c599e05 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/access/getfileids/conversation/GetFileIDsConversationContext.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/access/getfileids/conversation/GetFileIDsConversationContext.java
@@ -5,25 +5,22 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.access.getfileids.conversation;
 
-import java.net.URL;
-import java.util.Collection;
-
 import org.bitrepository.access.ContributorQuery;
 import org.bitrepository.client.conversation.ConversationContext;
 import org.bitrepository.client.eventhandler.EventHandler;
@@ -31,6 +28,9 @@
 import org.bitrepository.protocol.OperationType;
 import org.bitrepository.protocol.messagebus.MessageSender;
 
+import java.net.URL;
+import java.util.Collection;
+
 /**
  * Encapsulates the context for a GetFileIDs operation.
  */
@@ -41,19 +41,20 @@ public class GetFileIDsConversationContext extends ConversationContext {
     /**
      * Extends the {@link ConversationContext} constructor with
      * {@link org.bitrepository.access.getfileids.GetFileIDsClient} specific parameters.
-     * @param collectionID The ID for the collection
+     *
+     * @param collectionID       The ID for the collection
      * @param contributorQueries See {@link org.bitrepository.access.getfileids.GetFileIDsClient} for details.
-     * @param fileID The ID of the file to get
-     * @param urlForResult See {@link org.bitrepository.access.getfileids.GetFileIDsClient} for details.
-     * @param settings The settings for the context
-     * @param messageSender MessageSender to send messages
-     * @param clientID The ID of the client
-     * @param contributors The expected contributors
-     * @param eventHandler EventHandler to handle incoming events
+     * @param fileID             The ID of the file to get
+     * @param urlForResult       See {@link org.bitrepository.access.getfileids.GetFileIDsClient} for details.
+     * @param settings           The settings for the context
+     * @param messageSender      MessageSender to send messages
+     * @param clientID           The ID of the client
+     * @param contributors       The expected contributors
+     * @param eventHandler       EventHandler to handle incoming events
      */
     public GetFileIDsConversationContext(String collectionID, ContributorQuery[] contributorQueries, String fileID,
-            URL urlForResult, Settings settings, MessageSender messageSender, String clientID, 
-            Collection<String> contributors, EventHandler eventHandler) {
+                                         URL urlForResult, Settings settings, MessageSender messageSender, String clientID,
+                                         Collection<String> contributors, EventHandler eventHandler) {
         super(collectionID, OperationType.GET_FILE_IDS, settings, messageSender, clientID, fileID, contributors,
                 eventHandler, null);
         this.contributorQueries = contributorQueries;
@@ -61,14 +62,14 @@ public GetFileIDsConversationContext(String collectionID, ContributorQuery[] con
     }
 
     /**
-     * @return The contextual {@link ContributorQuery}'s 
+     * @return The contextual {@link ContributorQuery}'s
      */
     public ContributorQuery[] getContributorQueries() {
         return contributorQueries;
     }
 
     /**
-     *  @return The URL where the results are placed (if using URL delivery)
+     * @return The URL where the results are placed (if using URL delivery)
      */
     public URL getUrlForResult() {
         return urlForResult;
diff --git a/bitrepository-client/src/main/java/org/bitrepository/access/getfileids/conversation/GettingFileIDs.java b/bitrepository-client/src/main/java/org/bitrepository/access/getfileids/conversation/GettingFileIDs.java
index 7995bbabc..a21a339bc 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/access/getfileids/conversation/GettingFileIDs.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/access/getfileids/conversation/GettingFileIDs.java
@@ -1,32 +1,29 @@
 /*
  * #%L
  * Bitrepository Access
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.access.getfileids.conversation;
 
-import java.math.BigInteger;
-import java.util.Collection;
-
 import org.bitrepository.access.ContributorQuery;
 import org.bitrepository.bitrepositorymessages.GetFileIDsFinalResponse;
 import org.bitrepository.bitrepositorymessages.GetFileIDsRequest;
@@ -34,23 +31,25 @@
 import org.bitrepository.client.conversation.ConversationContext;
 import org.bitrepository.client.conversation.PerformingOperationState;
 import org.bitrepository.client.conversation.selector.SelectedComponentInfo;
-import org.bitrepository.client.exceptions.UnexpectedResponseException;
 import org.bitrepository.common.utils.CalendarUtils;
 import org.bitrepository.common.utils.FileIDsUtils;
 
+import java.math.BigInteger;
+import java.util.Collection;
+
 /**
- * Models the behavior of a GetFileIDs conversation during the operation phase. That is, it begins with the 
- * sending of <code>GetFileIDsRequest</code> messages and finishes with on the reception of the 
- * <code>GetFileIDsFinalResponse</code> messages from the responding pillars.
- *
- * Note that this is only used by the GetFileIDsConversation in the same package, therefore the visibility is package 
+ * Models the behavior of a GetFileIDs conversation during the operation phase. That is, it begins with the
+ * sending of {@link GetFileIDsRequest} messages and finishes with on the reception of the
+ * {@link GetFileIDsFinalResponse} messages from the responding pillars.
+ * <p/>
+ * Note that this is only used by the GetFileIDsConversation in the same package, therefore the visibility is package
  * protected.
  */
 public class GettingFileIDs extends PerformingOperationState {
     private final GetFileIDsConversationContext context;
 
-    /*
-     * @param context The conversation context.
+    /**
+     * @param context      The conversation context.
      * @param contributors The list of components the fileIDs should be collected from.
      */
     public GettingFileIDs(GetFileIDsConversationContext context, Collection<SelectedComponentInfo> contributors) {
@@ -61,12 +60,12 @@ public GettingFileIDs(GetFileIDsConversationContext context, Collection<Selected
     @Override
     protected void sendRequest() {
         context.getMonitor().requestSent("Sending request for get fileIDs", activeContributors.keySet().toString());
-        for(ContributorQuery query : context.getContributorQueries()) {
+        for (ContributorQuery query : context.getContributorQueries()) {
             if (activeContributors.containsKey(query.getComponentID())) {
                 GetFileIDsRequest msg = new GetFileIDsRequest();
                 initializeMessage(msg);
                 msg.setFileIDs(FileIDsUtils.createFileIDs(context.getFileID()));
-                if(context.getUrlForResult() != null) {
+                if (context.getUrlForResult() != null) {
                     msg.setResultAddress(context.getUrlForResult().toExternalForm() + "-" + query.getComponentID());
                 }
                 msg.setPillarID(query.getComponentID());
@@ -77,20 +76,25 @@ protected void sendRequest() {
                 }
                 if (query.getMaxTimestamp() != null) {
                     msg.setMaxTimestamp(CalendarUtils.getXmlGregorianCalendar(query.getMaxTimestamp()));
-                } if (query.getMaxNumberOfResults() != null) {
-                    msg.setMaxNumberOfResults(BigInteger.valueOf(query.getMaxNumberOfResults().intValue()));
+                }
+                if (query.getMaxNumberOfResults() != null) {
+                    msg.setMaxNumberOfResults(BigInteger.valueOf(query.getMaxNumberOfResults()));
                 }
                 context.getMessageSender().sendMessage(msg);
             }
         }
     }
 
+    /**
+     * @param msg The final response to process into result event.
+     */
     @Override
-    protected void generateContributorCompleteEvent(MessageResponse msg) throws UnexpectedResponseException {
-        GetFileIDsFinalResponse response = (GetFileIDsFinalResponse)msg;
-        boolean isPartialResult = response.isPartialResult() == null ? false : response.isPartialResult();
-        getContext().getMonitor().contributorComplete(new FileIDsCompletePillarEvent(
-            response.getFrom(), response.getCollectionID(), response.getResultingFileIDs(), isPartialResult));
+    protected void generateContributorCompleteEvent(MessageResponse msg) {
+        GetFileIDsFinalResponse response = (GetFileIDsFinalResponse) msg;
+        boolean isPartialResult = response.isPartialResult() != null && response.isPartialResult();
+        getContext().getMonitor().contributorComplete(
+                new FileIDsCompletePillarEvent(response.getFrom(), response.getCollectionID(), response.getResultingFileIDs(),
+                        isPartialResult));
     }
 
     @Override
diff --git a/bitrepository-client/src/main/java/org/bitrepository/access/getfileids/conversation/IdentifyPillarsForGetFileIDs.java b/bitrepository-client/src/main/java/org/bitrepository/access/getfileids/conversation/IdentifyPillarsForGetFileIDs.java
index 5a1e7c229..4f4c0b31b 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/access/getfileids/conversation/IdentifyPillarsForGetFileIDs.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/access/getfileids/conversation/IdentifyPillarsForGetFileIDs.java
@@ -1,23 +1,23 @@
 /*
  * #%L
  * Bitrepository Access
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -51,7 +51,7 @@ protected void sendRequest() {
         msg.setFileIDs(FileIDsUtils.createFileIDs(context.getFileID()));
         msg.setDestination(context.getSettings().getCollectionDestination());
         context.getMessageSender().sendMessage(msg);
-        context.getMonitor().identifyRequestSent("Identifying contributers for get fileIDs");
+        context.getMonitor().identifyRequestSent("Identifying contributors for get fileIDs");
     }
 
     @Override
diff --git a/bitrepository-client/src/main/java/org/bitrepository/access/getstatus/ConversationBasedGetStatusClient.java b/bitrepository-client/src/main/java/org/bitrepository/access/getstatus/ConversationBasedGetStatusClient.java
index 5f1efa6f7..ca6197979 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/access/getstatus/ConversationBasedGetStatusClient.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/access/getstatus/ConversationBasedGetStatusClient.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
diff --git a/bitrepository-client/src/main/java/org/bitrepository/access/getstatus/GetStatusClient.java b/bitrepository-client/src/main/java/org/bitrepository/access/getstatus/GetStatusClient.java
index 79340eaaf..60e83a7ba 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/access/getstatus/GetStatusClient.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/access/getstatus/GetStatusClient.java
@@ -5,33 +5,33 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.access.getstatus;
 
-import org.bitrepository.client.BitrepositoryClient;
+import org.bitrepository.client.BitRepositoryClient;
 import org.bitrepository.client.eventhandler.EventHandler;
 
-public interface GetStatusClient extends BitrepositoryClient {
-    
+public interface GetStatusClient extends BitRepositoryClient {
+
     /**
-     * Method for retrieving statuses for all components in the system. 
-     * 
-     * The method will return as soon as the communication has been setup.
+     * Method for retrieving statuses for all components in the system.
+     * <p/>
+     * The method will return as soon as the communication has been initialized.
      *
-     * @param eventHandler The handler which should receive notifications of the progress events. 
+     * @param eventHandler The handler which should receive notifications of the progress events.
      */
     void getStatus(EventHandler eventHandler);
 
diff --git a/bitrepository-client/src/main/java/org/bitrepository/access/getstatus/conversation/GetStatusConversationContext.java b/bitrepository-client/src/main/java/org/bitrepository/access/getstatus/conversation/GetStatusConversationContext.java
index 30ace5c0a..70d4da524 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/access/getstatus/conversation/GetStatusConversationContext.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/access/getstatus/conversation/GetStatusConversationContext.java
@@ -5,29 +5,30 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.access.getstatus.conversation;
 
-import java.util.Collection;
 import org.bitrepository.client.conversation.ConversationContext;
 import org.bitrepository.client.eventhandler.EventHandler;
 import org.bitrepository.common.settings.Settings;
 import org.bitrepository.protocol.OperationType;
 import org.bitrepository.protocol.messagebus.MessageSender;
 
+import java.util.Collection;
+
 public class GetStatusConversationContext extends ConversationContext {
 
     public GetStatusConversationContext(Settings settings, MessageSender messageSender, EventHandler eventHandler,
diff --git a/bitrepository-client/src/main/java/org/bitrepository/access/getstatus/conversation/GettingStatus.java b/bitrepository-client/src/main/java/org/bitrepository/access/getstatus/conversation/GettingStatus.java
index 08f21ae45..5aea763ed 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/access/getstatus/conversation/GettingStatus.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/access/getstatus/conversation/GettingStatus.java
@@ -5,45 +5,45 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.access.getstatus.conversation;
 
-import java.util.Collection;
 import org.bitrepository.bitrepositorymessages.GetStatusFinalResponse;
 import org.bitrepository.bitrepositorymessages.GetStatusRequest;
 import org.bitrepository.bitrepositorymessages.MessageResponse;
 import org.bitrepository.client.conversation.ConversationContext;
 import org.bitrepository.client.conversation.PerformingOperationState;
 import org.bitrepository.client.conversation.selector.SelectedComponentInfo;
-import org.bitrepository.client.exceptions.UnexpectedResponseException;
+
+import java.util.Collection;
 
 public class GettingStatus extends PerformingOperationState {
     private final GetStatusConversationContext context;
 
-    /*
-    * @param context The conversation context.
-    * @param contributors The list of components the fileIDs should be collected from.
-    */
+    /**
+     * @param context      The conversation context.
+     * @param contributors The list of components the fileIDs should be collected from.
+     */
     public GettingStatus(GetStatusConversationContext context, Collection<SelectedComponentInfo> contributors) {
         super(contributors);
         this.context = context;
     }
 
     @Override
-    protected void generateContributorCompleteEvent(MessageResponse msg) throws UnexpectedResponseException {
+    protected void generateContributorCompleteEvent(MessageResponse msg) {
         GetStatusFinalResponse response = (GetStatusFinalResponse) msg;
         getContext().getMonitor().contributorComplete(
                 new StatusCompleteContributorEvent(msg.getFrom(), response.getCollectionID(), response.getResultingStatus()));
@@ -52,7 +52,7 @@ protected void generateContributorCompleteEvent(MessageResponse msg) throws Unex
     @Override
     protected void sendRequest() {
         context.getMonitor().requestSent("Sending GetStatusRequest", activeContributors.keySet().toString());
-        for(String ID : activeContributors.keySet()) {
+        for (String ID : activeContributors.keySet()) {
             GetStatusRequest request = new GetStatusRequest();
             initializeMessage(request);
             request.setContributor(ID);
diff --git a/bitrepository-client/src/main/java/org/bitrepository/access/getstatus/conversation/IdentifyingContributorsForGetStatus.java b/bitrepository-client/src/main/java/org/bitrepository/access/getstatus/conversation/IdentifyingContributorsForGetStatus.java
index 5fd66c7c6..c42a2c0fb 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/access/getstatus/conversation/IdentifyingContributorsForGetStatus.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/access/getstatus/conversation/IdentifyingContributorsForGetStatus.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -33,17 +33,17 @@ public IdentifyingContributorsForGetStatus(GetStatusConversationContext context)
         super(context.getContributors());
         this.context = context;
     }
-    
+
     @Override
     protected void sendRequest() {
         IdentifyContributorsForGetStatusRequest request = new IdentifyContributorsForGetStatusRequest();
         initializeMessage(request);
         request.setDestination(context.getSettings().getCollectionDestination());
-        
+
         context.getMonitor().identifyRequestSent("Identifying contributors for getting status");
         context.getMessageSender().sendMessage(request);
     }
-    
+
     @Override
     protected ConversationContext getContext() {
         return context;
diff --git a/bitrepository-client/src/main/java/org/bitrepository/access/getstatus/conversation/StatusCompleteContributorEvent.java b/bitrepository-client/src/main/java/org/bitrepository/access/getstatus/conversation/StatusCompleteContributorEvent.java
index f45b830ca..98cdc2ccb 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/access/getstatus/conversation/StatusCompleteContributorEvent.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/access/getstatus/conversation/StatusCompleteContributorEvent.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -29,27 +29,30 @@
  */
 public class StatusCompleteContributorEvent extends ContributorCompleteEvent {
 
-    /** The status for the contributor.*/
+    /**
+     * The status for the contributor.
+     */
     private final ResultingStatus status;
-    
+
     /**
      * Constructor.
+     *
      * @param contributorID The ID of the contributor
-     * @param collectionID The ID of the collection
-     * @param status The status for the contributor.
+     * @param collectionID  The ID of the collection
+     * @param status        The status for the contributor.
      */
     public StatusCompleteContributorEvent(String contributorID, String collectionID, ResultingStatus status) {
         super(contributorID, collectionID);
         this.status = status;
     }
-    
+
     /**
      * @return The status of for the contributor.
      */
     public ResultingStatus getStatus() {
         return status;
     }
-    
+
     @Override
     public String additionalInfo() {
         return super.additionalInfo() + ", resulting status: " + status;
diff --git a/bitrepository-client/src/main/java/org/bitrepository/access/package-info.java b/bitrepository-client/src/main/java/org/bitrepository/access/package-info.java
index ce9a78975..6a076760b 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/access/package-info.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/access/package-info.java
@@ -1,29 +1,29 @@
 /*
  * #%L
- * Bitrepository Access Client
- * 
+ * BitRepository Access Client
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 /**
- * Contains functionality for reading from a Bitrepository system. 
+ * Contains functionality for reading from a BitRepository system.
  * This includes Get File, Get Checksums and Get File IDs.
  */
 package org.bitrepository.access;
\ No newline at end of file
diff --git a/bitrepository-client/src/main/java/org/bitrepository/client/AbstractClient.java b/bitrepository-client/src/main/java/org/bitrepository/client/AbstractClient.java
index 05064f159..26a1be28d 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/client/AbstractClient.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/client/AbstractClient.java
@@ -1,23 +1,23 @@
 /*
  * #%L
  * Bitrepository Protocol
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -38,24 +38,35 @@
 /**
  * Implements the generic functionality for a reference client
  */
-public class AbstractClient implements BitrepositoryClient {
-    /** The settings for this instance.*/
+public class AbstractClient implements BitRepositoryClient {
+    /**
+     * The settings for this instance.
+     */
     protected final Settings settings;
-    /** The messagebus for communication.*/
+    /**
+     * The messageBus for communication.
+     */
     protected final MessageBus messageBus;
-    /** The mediator which should manage the conversations. */
+    /**
+     * The mediator which should manage the conversations.
+     */
     protected final String clientID;
-    /** The mediator which should manage the conversations. */
+    /**
+     * The mediator which should manage the conversations.
+     */
     private final ConversationMediator conversationMediator;
-    /** The FileIDValidator.*/
+    /**
+     * The FileIDValidator.
+     */
     private final FileIDValidator validator;
-    
+
     /**
      * Constructor.
-     * @param settings The settings.
+     *
+     * @param settings             The settings.
      * @param conversationMediator The mediator.
-     * @param messageBus The messagebus.
-     * @param clientID The id of the client.
+     * @param messageBus           The messageBus.
+     * @param clientID             The id of the client.
      */
     public AbstractClient(Settings settings, ConversationMediator conversationMediator, MessageBus messageBus, String clientID) {
         ArgumentValidator.checkNotNull(clientID, "clientID");
@@ -66,18 +77,20 @@ public AbstractClient(Settings settings, ConversationMediator conversationMediat
         validator = new FileIDValidator(settings);
         SettingsUtils.initialize(settings);
     }
-    
+
     /**
      * Validates the id of a file.
+     *
      * @param fileID The file id to validate.
      */
     protected void validateFileID(String fileID) {
         validator.checkFileID(fileID);
     }
-    
+
     /**
      * Starts the conversation.
-     * @param context The context for the new conversion.
+     *
+     * @param context    The context for the new conversion.
      * @param startState The starting state
      */
     protected void startConversation(ConversationContext context, GeneralConversationState startState) {
diff --git a/bitrepository-client/src/main/java/org/bitrepository/client/BitrepositoryClient.java b/bitrepository-client/src/main/java/org/bitrepository/client/BitRepositoryClient.java
similarity index 93%
rename from bitrepository-client/src/main/java/org/bitrepository/client/BitrepositoryClient.java
rename to bitrepository-client/src/main/java/org/bitrepository/client/BitRepositoryClient.java
index 1f75fdea3..aa83f7901 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/client/BitrepositoryClient.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/client/BitRepositoryClient.java
@@ -1,23 +1,23 @@
 /*
  * #%L
  * Bitrepository Protocol
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -27,5 +27,5 @@
 /**
  * Defines the general functionality of Bit Repository reference client classes.
  */
-public interface BitrepositoryClient {
+public interface BitRepositoryClient {
 }
diff --git a/bitrepository-client/src/main/java/org/bitrepository/client/CommandLineSettingsProvider.java b/bitrepository-client/src/main/java/org/bitrepository/client/CommandLineSettingsProvider.java
index f95d8f23e..e4cb8b300 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/client/CommandLineSettingsProvider.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/client/CommandLineSettingsProvider.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -31,10 +31,9 @@ public class CommandLineSettingsProvider extends SettingsProvider {
     /**
      * Creates a <code>SettingsProvider</code> which will use the provided <code>SettingsLoader</code> for loading the
      * settings.
-     * Sets the componentID to one generated by a <code>ComponentIDFactory</code> depending on what is set in 
+     * Sets the componentID to one generated by a <code>ComponentIDFactory</code> depending on what is set in
      * ReferenceSettings - ClientSettings - ComponentIDFactory.
-     * If none ComponentIDFactory is set, the default is to use <code>DefaultCommandlineComponentID</code> 
-     * 
+     * If none ComponentIDFactory is set, the default is to use <code>DefaultCommandlineComponentID</code>
      *
      * @param settingsReader Use for loading the settings.
      */
@@ -47,9 +46,9 @@ protected String getComponentID(ReferenceSettings referenceSettings) {
         if (referenceSettings.getClientSettings().getComponentIDFactoryClass() != null) {
             componentIDFactoryClass = referenceSettings.getClientSettings().getComponentIDFactoryClass();
         }
-        
+
         ComponentIDHelper helper = new ComponentIDHelper(componentIDFactoryClass);
-        
+
         return helper.getComponentID();
     }
 }
diff --git a/bitrepository-client/src/main/java/org/bitrepository/client/componentid/ComponentIDFactory.java b/bitrepository-client/src/main/java/org/bitrepository/client/componentid/ComponentIDFactory.java
index ab3ea70b3..191898222 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/client/componentid/ComponentIDFactory.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/client/componentid/ComponentIDFactory.java
@@ -8,12 +8,12 @@
  * it under the terms of the GNU Lesser General Public License as
  * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
@@ -22,10 +22,10 @@
 package org.bitrepository.client.componentid;
 
 /**
- * Defines the interface for implementing the generation of client IDs 
+ * Defines the interface for implementing the generation of client IDs
  */
 public interface ComponentIDFactory {
-    
+
     String getComponentID();
 
 }
diff --git a/bitrepository-client/src/main/java/org/bitrepository/client/componentid/ComponentIDHelper.java b/bitrepository-client/src/main/java/org/bitrepository/client/componentid/ComponentIDHelper.java
index bdd60c0c2..3cb49be41 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/client/componentid/ComponentIDHelper.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/client/componentid/ComponentIDHelper.java
@@ -1,39 +1,37 @@
 /*
-* #%L
+ * #%L
  * * Bitmagasin integrationstest
- * 
+ *
  * %%
  * Copyright (C) 2010 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
-*/
+ */
 
 package org.bitrepository.client.componentid;
 
-import org.bitrepository.client.componentid.ComponentIDFactory;
-import org.bitrepository.client.componentid.DefaultCommandlineComponentID;
-
 /**
  * Provides destination utilities.
  */
 public class ComponentIDHelper {
-    private ComponentIDFactory clientIDFactory;
+    private final ComponentIDFactory clientIDFactory;
 
     /**
      * Create a <code>ClientIDHelper</code> object with the specified charactaristica
+     *
      * @param clientIDFactoryClass The class to use for constructing clientID.
      */
     public ComponentIDHelper(String clientIDFactoryClass) {
@@ -52,7 +50,7 @@ private ComponentIDFactory createClientIDFactory(String clientIDFactoryClass) {
             return new DefaultCommandlineComponentID();
         } else {
             try {
-                return (ComponentIDFactory)Class.forName(clientIDFactoryClass).getDeclaredConstructor().newInstance();
+                return (ComponentIDFactory) Class.forName(clientIDFactoryClass).getDeclaredConstructor().newInstance();
             } catch (Exception e) {
                 throw new RuntimeException("Unable to instantiate ClientIDFactory " +
                         clientIDFactoryClass +
diff --git a/bitrepository-client/src/main/java/org/bitrepository/client/componentid/DefaultCommandlineComponentID.java b/bitrepository-client/src/main/java/org/bitrepository/client/componentid/DefaultCommandlineComponentID.java
index 29e139ee3..e535c298a 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/client/componentid/DefaultCommandlineComponentID.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/client/componentid/DefaultCommandlineComponentID.java
@@ -8,12 +8,12 @@
  * it under the terms of the GNU Lesser General Public License as
  * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
@@ -21,10 +21,8 @@
  */
 package org.bitrepository.client.componentid;
 
-import org.bitrepository.client.componentid.ComponentIDFactory;
-
 /**
- * Delivers the default commandline client ID. 
+ * Delivers the default commandline client ID.
  */
 public class DefaultCommandlineComponentID implements ComponentIDFactory {
 
diff --git a/bitrepository-client/src/main/java/org/bitrepository/client/componentid/UniqueCommandlineComponentID.java b/bitrepository-client/src/main/java/org/bitrepository/client/componentid/UniqueCommandlineComponentID.java
index 626edcd9c..af0ed0e11 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/client/componentid/UniqueCommandlineComponentID.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/client/componentid/UniqueCommandlineComponentID.java
@@ -8,12 +8,12 @@
  * it under the terms of the GNU Lesser General Public License as
  * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
@@ -25,10 +25,8 @@
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 
-import org.bitrepository.client.componentid.ComponentIDFactory;
-
 /**
- * Delivers a client ID that is unique to the host, user and process that runs the client.  
+ * Delivers a client ID that is unique to the host, user and process that runs the client.
  */
 public class UniqueCommandlineComponentID implements ComponentIDFactory {
 
@@ -36,10 +34,10 @@ public class UniqueCommandlineComponentID implements ComponentIDFactory {
     public String getComponentID() {
         try {
             String hostname = InetAddress.getLocalHost().getHostName();
-            String username = System.getProperty("user.name"); 
+            String username = System.getProperty("user.name");
             String PID = ManagementFactory.getRuntimeMXBean().getName().split("@")[0];
-            
-            return hostname + "-" + username + "-" + PID;    
+
+            return hostname + "-" + username + "-" + PID;
         } catch (UnknownHostException e) {
             throw new RuntimeException("Failed to lookup hostname", e);
         }
diff --git a/bitrepository-client/src/main/java/org/bitrepository/client/conversation/Conversation.java b/bitrepository-client/src/main/java/org/bitrepository/client/conversation/Conversation.java
index 2aa1774af..3d3e763be 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/client/conversation/Conversation.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/client/conversation/Conversation.java
@@ -1,23 +1,23 @@
 /*
  * #%L
  * Bitrepository Protocol
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -29,46 +29,49 @@
 
 /**
  * A conversation models the messaging based workflow used to accomplish a operation called on a client interface.
- * 
+ * <p>
  * The interface primarily consists of sending and receiving message functionality.
- * 
+ *
  * <h3>Implementation considerations</h3>
- * 
+ * <p>
  * The following concerns needs to be addressed by classes implementing this interface.
- * 
+ *
  * <h4>Threadsafe</h4>
- * Note that conversation needs to be thread safe as multiple messages and timer event may occur in parallel. 
- * 
+ * Note that conversation needs to be thread safe as multiple messages and timer event may occur in parallel.
+ *
  * <h4>Timeouts</h4>
  * The conversation implementation should include timeouts for the different conversation phases.
- * 
+ *
  * <h4>Error handling</h4>
- * As conversation will normally be called in either a asynchronously manor using a callback listener or synchronous, 
- * the error handling needs to behave differently in the two cases. This means a error handling block will typically 
- * contain a <code>if (callbackListener == null) { ... } else {...}</code> block.
+ * As a conversation will normally be called in either an asynchronous way, using a callback listener, or synchronous;
+ * the error handling needs to behave differently in the two cases. This means an error handling block will typically
+ * contain a
+ * <p> <code>if (callbackListener == null) { ... } else {...}</code> </p>
+ * block.
  */
 public interface Conversation extends MessageListener {
     /**
      * Get the conversation ID for this conversation.
-     *
+     * <p>
      * Implementations must ensure that conversation IDs are unique, and that this ID is always used when sending
      * messages.
      *
      * @return The conversation ID.
      */
     String getConversationID();
-    
+
     /**
      * Returns the start time for the conversation. Main use is to timeout conversations, which have lasted too long.
+     *
      * @return The start time of the conversation as set by the System.currentTimeMillis().
      */
     long getStartTime();
-    
+
     /**
      * Starts the conversation.
      */
     void startConversation();
-    
+
     /**
      * Ends the conversation. This means setting any relevant conversation state.
      */
@@ -81,10 +84,11 @@ public interface Conversation extends MessageListener {
      * @return Whether this conversation has ended.
      */
     boolean hasEnded();
-    
+
     /**
-     * Can be used to fail an conversation. This might be caused by a timeout or other event.
-     * @param operationFailedEvent Contains information regarding the cause for the failure. 
+     * Can be used to fail a conversation. This might be caused by a timeout or other event.
+     *
+     * @param operationFailedEvent Contains information regarding the cause for the failure.
      */
     void failConversation(OperationFailedEvent operationFailedEvent);
 }
diff --git a/bitrepository-client/src/main/java/org/bitrepository/client/conversation/ConversationContext.java b/bitrepository-client/src/main/java/org/bitrepository/client/conversation/ConversationContext.java
index cddfb47cd..d27e59dc1 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/client/conversation/ConversationContext.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/client/conversation/ConversationContext.java
@@ -5,31 +5,32 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.client.conversation;
 
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
 import org.bitrepository.client.eventhandler.EventHandler;
 import org.bitrepository.common.settings.Settings;
 import org.bitrepository.protocol.CorrelationIDGenerator;
 import org.bitrepository.protocol.OperationType;
 import org.bitrepository.protocol.messagebus.MessageSender;
 
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+
 /**
  * Encapsulates the shared state for a conversation.
  */
@@ -49,26 +50,20 @@ public class ConversationContext {
     /**
      * Encapsulates the common state maintained in a conversation. Will typically be subclasses to provide
      * operation specific attributes.
-     * @param collectionID The collectionID to use perform the conversation for.
-     * @param operationType Used for logging purposes.
-     * @param settings The settings to use in this conversation context.
-     * @param messageSender The messageSender to use in this conversation context.
-     * @param clientID The clientID to use in this conversation context.
-     * @param fileID Optional fileID to use in this conversation context.
-     * @param contributors The contributors to use in this conversation context.
-     * @param eventHandler The eventHandler to use in this conversation context.
+     *
+     * @param collectionID          The collectionID to use perform the conversation for.
+     * @param operationType         Used for logging purposes.
+     * @param settings              The settings to use in this conversation context.
+     * @param messageSender         The messageSender to use in this conversation context.
+     * @param clientID              The clientID to use in this conversation context.
+     * @param fileID                Optional fileID to use in this conversation context.
+     * @param contributors          The contributors to use in this conversation context.
+     * @param eventHandler          The eventHandler to use in this conversation context.
      * @param auditTrailInformation the audit trail information
      */
-    public ConversationContext(
-            String collectionID,
-            OperationType operationType,
-            Settings settings,
-            MessageSender messageSender,
-            String clientID,
-            String fileID,
-            Collection<String> contributors,
-            EventHandler eventHandler,
-            String auditTrailInformation) {
+    public ConversationContext(String collectionID, OperationType operationType, Settings settings, MessageSender messageSender,
+                               String clientID, String fileID, Collection<String> contributors, EventHandler eventHandler,
+                               String auditTrailInformation) {
         this.collectionID = collectionID;
         this.settings = settings;
         this.messageSender = messageSender;
@@ -130,6 +125,7 @@ public boolean isChecksumPillar(String pillarID) {
 
     /**
      * Use to register checksum pillars.
+     *
      * @param pillarID The pillarID of the Checksum pillar.
      */
     public void addChecksumPillar(String pillarID) {
@@ -138,16 +134,9 @@ public void addChecksumPillar(String pillarID) {
 
     @Override
     public String toString() {
-        return this.getClass().getSimpleName()+"{" +
-               "collectionID='" + collectionID + '\'' +
-               ", conversationID='" + conversationID + '\'' +
-               ", clientID='" + clientID + '\'' +
-               ", fileID='" + fileID + '\'' +
-               ", contributors=" + contributors +
-               ", monitor=" + monitor +
-               ", auditTrailInformation='" + auditTrailInformation + '\'' +
-               ", state=" + state +
-               ", checksumPillars=" + checksumPillars +
-               '}';
+        return this.getClass().getSimpleName() + "{" + "collectionID='" + collectionID + '\'' + ", conversationID='" + conversationID +
+                '\'' + ", clientID='" + clientID + '\'' + ", fileID='" + fileID + '\'' + ", contributors=" + contributors + ", monitor=" +
+                monitor + ", auditTrailInformation='" + auditTrailInformation + '\'' + ", state=" + state + ", checksumPillars=" +
+                checksumPillars + '}';
     }
 }
diff --git a/bitrepository-client/src/main/java/org/bitrepository/client/conversation/ConversationEventMonitor.java b/bitrepository-client/src/main/java/org/bitrepository/client/conversation/ConversationEventMonitor.java
index 86d70f300..ab1410b33 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/client/conversation/ConversationEventMonitor.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/client/conversation/ConversationEventMonitor.java
@@ -1,33 +1,29 @@
 /*
  * #%L
  * Bitrepository Protocol
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.client.conversation;
 
-import java.util.Collection;
-import java.util.LinkedList;
-import java.util.List;
-
 import org.bitrepository.bitrepositoryelements.ResponseCode;
 import org.bitrepository.bitrepositorymessages.Message;
 import org.bitrepository.bitrepositorymessages.MessageResponse;
@@ -45,6 +41,10 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+
 import static org.bitrepository.client.eventhandler.OperationEvent.OperationEventType.COMPONENT_IDENTIFIED;
 import static org.bitrepository.client.eventhandler.OperationEvent.OperationEventType.IDENTIFY_REQUEST_SENT;
 import static org.bitrepository.client.eventhandler.OperationEvent.OperationEventType.IDENTIFY_TIMEOUT;
@@ -57,35 +57,43 @@
  * Encapsulates the concrete handling of conversation events. Should be called every time a conversation event happens.
  */
 public class ConversationEventMonitor {
-    /** The general logger.*/
+    /**
+     * The general logger.
+     */
     private final ConversationLogger log;
-    /** The event logger. Adds context information to the log entry. */
+    /**
+     * The event logger. Adds context information to the log entry.
+     */
     private final Logger eventLogger = LoggerFactory.getLogger(getClass());
     private final String collectionID;
     private final String conversationID;
     private final OperationType operationType;
     private final String fileID;
     private final EventHandler eventHandler;
-    /** Used to aggregate the conversation complete events, so these can be added to the final complete event. */
+    /**
+     * Used to aggregate the conversation complete events, so these can be added to the final complete event.
+     */
     private final List<ContributorEvent> contributorCompleteEvents = new LinkedList<>();
-    /** Used to aggregate the conversation failed events, so these can be added to the final failed event. */
+    /**
+     * Used to aggregate the conversation failed events, so these can be added to the final failed event.
+     */
     private final List<ContributorFailedEvent> contributorFailedEvents = new LinkedList<>();
     /**
      * Indicated whether the final operation event should be a complete event or a failed event in case of individual
      * component failures.
-      */
+     */
     private boolean failOnComponentFailure = true;
 
     /**
-     * @param collectionID The Collection ID
+     * @param collectionID   The Collection ID
      * @param conversationID Used for adding conversation context information to the information distributed. Will be
      *                       shorted to increase readability.
-     * @param operationType The operation type to include in the events og logs.
-     * @param fileID Optional file ID to include in the events and logs.
-     * @param eventHandler The eventHandler to send updates to.
+     * @param operationType  The operation type to include in the events og logs.
+     * @param fileID         Optional file ID to include in the events and logs.
+     * @param eventHandler   The eventHandler to send updates to.
      */
-    public ConversationEventMonitor(String collectionID, String conversationID, OperationType operationType, String fileID, 
-            EventHandler eventHandler) {
+    public ConversationEventMonitor(String collectionID, String conversationID, OperationType operationType, String fileID,
+                                    EventHandler eventHandler) {
         log = new ConversationLogger();
         this.collectionID = collectionID;
         this.conversationID = getShortConversationID(conversationID);
@@ -95,156 +103,170 @@ public ConversationEventMonitor(String collectionID, String conversationID, Oper
     }
 
     /**
-     * Indicates a identify request has been sent to the contributors.
+     * Indicates that an identify request has been sent to the contributors.
+     *
      * @param info Description
      */
     public void identifyRequestSent(String info) {
-        notifyEventListerners(createDefaultEvent(IDENTIFY_REQUEST_SENT, info));
+        notifyEventListeners(createDefaultEvent(IDENTIFY_REQUEST_SENT, info));
     }
 
     /**
      * Indicates a contributor has been identified and considered for selection.
-     * @param response The identify response.
+     *
+     * @param response An identify response.
      */
     public void contributorIdentified(MessageResponse response) {
-        notifyEventListerners(createContributorEvent(COMPONENT_IDENTIFIED, null, response.getFrom()));
+        notifyEventListeners(createContributorEvent(COMPONENT_IDENTIFIED, null, response.getFrom()));
     }
 
     /**
-     * Indicates a identify request has timeout without all contributors responding.
-     * @param unrespondingContributors the unresponding contributors
+     * Indicates an identify request has timeout without all contributors responding.
+     *
+     * @param unresponsiveContributors The unresponsive contributors
      */
-    public void identifyContributorsTimeout(Collection<String> unrespondingContributors) {
+    public void identifyContributorsTimeout(Collection<String> unresponsiveContributors) {
         StringBuilder failureMessage = new StringBuilder("Time has run out for looking up contributors");
-        if (!unrespondingContributors.isEmpty()) {
-            failureMessage.append("\nThe following contributors didn't respond: " + unrespondingContributors);
+        if (!unresponsiveContributors.isEmpty()) {
+            failureMessage.append("\nThe following contributors didn't respond: ").append(unresponsiveContributors);
         }
-        notifyEventListerners(createDefaultEvent(IDENTIFY_TIMEOUT, failureMessage.toString()));
+        notifyEventListeners(createDefaultEvent(IDENTIFY_TIMEOUT, failureMessage.toString()));
 
-        for (String contributorID : unrespondingContributors) {
+        for (String contributorID : unresponsiveContributors) {
             contributorFailed("Timeout for identifying contributor", contributorID, null);
         }
     }
 
     /**
      * Indicates a contributor has been selected for a operation request.
+     *
      * @param contributorIDList The contributors identified
      */
     public void contributorsSelected(List<String> contributorIDList) {
-        notifyEventListerners(createContributorsIdentifiedEvent(contributorIDList));
+        notifyEventListeners(createContributorsIdentifiedEvent(contributorIDList));
     }
 
     /**
      * A request has been sent to a contributor.
-     * @param info Description of the context.
+     *
+     * @param info          Description of the context.
      * @param contributorID The ID of the contributor
      */
     public void requestSent(String info, String contributorID) {
-        notifyEventListerners(createContributorEvent(REQUEST_SENT, info, contributorID));
+        notifyEventListeners(createContributorEvent(REQUEST_SENT, info, contributorID));
     }
 
     /**
      * New information regarding the progress of the operation has been received
+     *
      * @param progressEvent Contains information regarding the progress
      */
     public void progress(AbstractOperationEvent progressEvent) {
         addContextInfo(progressEvent);
-        notifyEventListerners(progressEvent);
+        notifyEventListeners(progressEvent);
     }
 
     /**
      * New information regarding the progress of the operation has been received
-     * @param progressInfo Contains information regarding the progress
+     *
+     * @param progressInfo  Contains information regarding the progress
      * @param contributorID the contributor that is progressed
      */
     public void progress(String progressInfo, String contributorID) {
-        notifyEventListerners(createContributorEvent(PROGRESS, progressInfo, contributorID));
+        notifyEventListeners(createContributorEvent(PROGRESS, progressInfo, contributorID));
     }
-    
+
     /**
-     * Notify that a contributor has failed in a way resulting in a retry attempt. 
-     * @param info Information regarding the retry attempt
-     * @param contributorID the contributor that is retried.  
+     * Notify that a contributor has failed in a way resulting in a retry attempt.
+     *
+     * @param info          Information regarding the retry attempt
+     * @param contributorID the contributor that is retried.
      */
     public void retry(String info, String contributorID) {
-        notifyEventListerners(createContributorEvent(WARNING, info, contributorID));
+        notifyEventListeners(createContributorEvent(WARNING, info, contributorID));
     }
 
     /**
      * A pillar has completed the operation.
+     *
      * @param completeEvent Event containing any additional information regarding the completion. Might contain the
-     * return value from the operation, in which case the event will be a <code>DefafaultEvent</code> subclass.
+     *                      return value from the operation, in which case the event will be a <code>DefaultEvent</code> subclass.
      */
     public void contributorComplete(ContributorCompleteEvent completeEvent) {
         contributorCompleteEvents.add(completeEvent);
         addContextInfo(completeEvent);
-        notifyEventListerners(completeEvent);
+        notifyEventListeners(completeEvent);
     }
 
     /**
      * A pillar has failed to handle a request successfully.
-     * @param info Cause information
+     *
+     * @param info          Cause information
      * @param contributorID The ID of the contributor
-     * @param responseCode the response code of the contributor
+     * @param responseCode  the response code of the contributor
      */
     public void contributorFailed(String info, String contributorID, ResponseCode responseCode) {
         ContributorFailedEvent failedEvent = createContributorFailedEvent(info, contributorID, responseCode);
         contributorFailedEvents.add(failedEvent);
-        notifyEventListerners(failedEvent);
+        notifyEventListeners(failedEvent);
     }
-    
+
     /**
      * Timeout contributors that have not responded in the performing state
+     *
      * @param contributorIDs The collection of IDs for the contributors
      */
     public void timeoutRemainingContributors(Collection<String> contributorIDs) {
-        for(String contributorID : contributorIDs) {
-            contributorFailed("Contributor timedout performing operation", contributorID, null);
+        for (String contributorID : contributorIDs) {
+            contributorFailed("Contributor timed out while performing operation", contributorID, null);
         }
     }
 
     /**
-     * An operation has completed. Will generate a failed event, if any of the contributers have failed.
+     * An operation has completed. Will generate a failed event, if any of the contributors have failed.
      */
     public void complete() {
         if (contributorFailedEvents.isEmpty() || !failOnComponentFailure) {
-            notifyEventListerners(createCompleteEvent());
+            notifyEventListeners(createCompleteEvent());
         } else {
             String info = "Failed operation. Cause(s):\n" + contributorFailedEvents;
-            notifyEventListerners(createOperationFailedEvent(info));
+            notifyEventListeners(createOperationFailedEvent(info));
         }
     }
 
     /**
      * General failure to complete the operation.
+     *
      * @param info Encapsulates the cause.
      */
     public void operationFailed(String info) {
-        notifyEventListerners(createOperationFailedEvent(info));
+        notifyEventListeners(createOperationFailedEvent(info));
     }
 
     /**
      * General failure to complete the operation.
+     *
      * @param event Encapsulates the cause.
      */
     public void operationFailed(OperationFailedEvent event) {
         addContextInfo(event);
-        notifyEventListerners(event);
+        notifyEventListeners(event);
     }
 
     /**
      * An invalid messages has been received
+     *
      * @param message the invalid message
-     * @param e Description of the context
+     * @param e       Description of the context
      */
     public void invalidMessage(Message message, Exception e) {
-        log.warn("Received invalid " + message.getClass().getSimpleName() + " from " + message.getFrom() +
-                "\nMessage: " + message, e);
-        notifyEventListerners((createContributorEvent(WARNING, e.getMessage(), message.getFrom())));
+        log.warn("Received invalid " + message.getClass().getSimpleName() + " from " + message.getFrom() + "\nMessage: " + message, e);
+        notifyEventListeners((createContributorEvent(WARNING, e.getMessage(), message.getFrom())));
     }
 
     /**
      * A message has been received with isn't consistent with the current conversation state.
+     *
      * @param message the message
      */
     public void outOfSequenceMessage(Message message) {
@@ -253,26 +275,30 @@ public void outOfSequenceMessage(Message message) {
 
     /**
      * Signifies a non-fatal event
+     *
      * @param info Problem description
      */
     public void warning(String info) {
-        notifyEventListerners(createDefaultEvent(WARNING, info));
+        notifyEventListeners(createDefaultEvent(WARNING, info));
     }
 
     /**
      * Signifies a non-fatal event
+     *
      * @param info Problem description
-     * @param e The cause
+     * @param e    The cause
      */
     public void warning(String info, Exception e) {
         if (e == null) {
             warning(info);
+        } else {
+            notifyEventListeners(createDefaultEvent(WARNING, info + ", " + e.getMessage()));
         }
-        notifyEventListerners(createDefaultEvent(WARNING, info + ", " + e.getMessage()));
     }
 
     /**
      * Logs debug information.
+     *
      * @param info The debug info to log.
      */
     public void debug(String info) {
@@ -281,17 +307,18 @@ public void debug(String info) {
 
     /**
      * Logs debug information.
+     *
      * @param info The debug info to log.
-     * @param e the Exception to log
+     * @param e    the Exception to log
      */
     public void debug(String info, Exception e) {
         log.debug(info, e);
     }
 
     /**
-     * @return  a shorted conversationID. Only the first part up til the first '-' is used
-     * (but at least 4 long).
      * @param fullConversationID the full conversationID to shorten
+     * @return a shorted conversationID. Only the first part up til the first '-' is used
+     * (but at least 4 long).
      */
     private String getShortConversationID(String fullConversationID) {
         return fullConversationID.substring(0, fullConversationID.indexOf("-", 4));
@@ -304,16 +331,16 @@ private DefaultEvent createDefaultEvent(OperationEvent.OperationEventType eventT
         addContextInfo(event);
         return event;
     }
-    private ContributorEvent createContributorEvent(
-            OperationEvent.OperationEventType eventType, String info, String contributorID) {
+
+    private ContributorEvent createContributorEvent(OperationEvent.OperationEventType eventType, String info, String contributorID) {
         ContributorEvent event = new ContributorEvent(contributorID, collectionID);
         event.setEventType(eventType);
         event.setInfo(info);
         addContextInfo(event);
         return event;
     }
-    private ContributorFailedEvent createContributorFailedEvent(String info, String contributorID,
-            ResponseCode responseCode) {
+
+    private ContributorFailedEvent createContributorFailedEvent(String info, String contributorID, ResponseCode responseCode) {
         ContributorFailedEvent event = new ContributorFailedEvent(contributorID, collectionID, responseCode);
         event.setInfo(info);
         addContextInfo(event);
@@ -340,20 +367,21 @@ private CompleteEvent createCompleteEvent() {
 
     /**
      * Adds the general operation context information for the conversation to the event.
+     *
      * @param event the event to update
-     * @return the updated event
      */
-    private AbstractOperationEvent addContextInfo(AbstractOperationEvent event) {
+    private void addContextInfo(AbstractOperationEvent event) {
         event.setConversationID(conversationID);
         event.setFileID(fileID);
         event.setOperationType(operationType);
-        return event;
     }
+
     /**
-     * Indicates whether a operation should be consider failed because one or more of the contributors have failed.
+     * Indicates whether an operation should be considered failed because one or more of the contributors have failed.
      * This is <code>true</code> by default.
-     *<p>
-     * Note that the operation can be falied explicitly by calling the operationFailed method.
+     * <p>
+     * Note that the operation can be failed explicitly by calling the operationFailed method.
+     *
      * @param failOnComponentFailure true if the conversation should be marked as failed if a contributor have failed
      */
     public void markAsFailedOnContributorFailure(boolean failOnComponentFailure) {
@@ -365,61 +393,71 @@ public void markAsFailedOnContributorFailure(boolean failOnComponentFailure) {
      */
     protected class ConversationLogger {
 
-        /** Delegates to the normal logger debug
+        /**
+         * Delegates to the normal logger debug
+         *
          * @param msg the message to log
-         * */
+         */
         public void debug(String msg) {
-            eventLogger.debug(conversationID + ": " + contextInfo() + ":" +msg);
+            eventLogger.debug(conversationID + ": " + contextInfo() + ":" + msg);
         }
 
-        /** Delegates to the normal logger debug
+        /**
+         * Delegates to the normal logger debug
+         *
          * @param msg the message to log
-         * @param e the Exception to log
-         * */
+         * @param e   the Exception to log
+         */
         public void debug(String msg, Exception e) {
             eventLogger.debug(conversationID + ": " + contextInfo() + ":" + msg, e);
         }
 
-        /** Delegates to the normal logger info
+        /**
+         * Delegates to the normal logger info
+         *
          * @param msg the message to log
-         * */
+         */
         public void info(String msg) {
-            eventLogger.info(conversationID + ": " + contextInfo() + ":" +msg);
+            eventLogger.info(conversationID + ": " + contextInfo() + ":" + msg);
         }
 
-        /** Delegates to the normal logger warn
+        /**
+         * Delegates to the normal logger warn
+         *
          * @param msg the message to log
-         * @param e throwable to log
-         * */
+         * @param e   throwable to log
+         */
         public void warn(String msg, Throwable e) {
-            eventLogger.warn(conversationID + ": " + contextInfo() + ":" +msg, e);
+            eventLogger.warn(conversationID + ": " + contextInfo() + ":" + msg, e);
         }
 
-        /** Delegates to the normal logger warn
+        /**
+         * Delegates to the normal logger warn
+         *
          * @param msg the message to log
-         * */
+         */
         public void warn(String msg) {
-            eventLogger.warn(conversationID + ": " + contextInfo() + ":" +msg);
+            eventLogger.warn(conversationID + ": " + contextInfo() + ":" + msg);
         }
 
         private String contextInfo() {
             StringBuilder sb = new StringBuilder();
             sb.append(operationType);
             if (fileID != null) {
-                sb.append(" for file " + fileID);
+                sb.append(" for file ").append(fileID);
             }
             return sb.toString();
         }
 
     }
 
-    private void notifyEventListerners(OperationEvent event) {
+    private void notifyEventListeners(OperationEvent event) {
         eventLogger.trace(event.toString());
         if (eventHandler != null) {
             try {
                 eventHandler.handleEvent(event);
             } catch (Throwable thr) {
-                log.warn("The eventhandler (" + eventHandler + ") failed when called with event " + event, thr);
+                log.warn("The eventHandler (" + eventHandler + ") failed when called with event " + event, thr);
             }
         }
     }
@@ -427,15 +465,9 @@ private void notifyEventListerners(OperationEvent event) {
 
     @Override
     public String toString() {
-        return "ConversationEventMonitor{" +
-               ", collectionID='" + collectionID + '\'' +
-               ", conversationID='" + conversationID + '\'' +
-               ", operationType=" + operationType +
-               ", fileID='" + fileID + '\'' +
-               ", eventHandler=" + eventHandler +
-               ", contributorCompleteEvents=" + contributorCompleteEvents +
-               ", contributorFailedEvents=" + contributorFailedEvents +
-               ", failOnComponentFailure=" + failOnComponentFailure +
-               '}';
+        return "ConversationEventMonitor{" + ", collectionID='" + collectionID + '\'' + ", conversationID='" + conversationID + '\'' +
+                ", operationType=" + operationType + ", fileID='" + fileID + '\'' + ", eventHandler=" + eventHandler +
+                ", contributorCompleteEvents=" + contributorCompleteEvents + ", contributorFailedEvents=" + contributorFailedEvents +
+                ", failOnComponentFailure=" + failOnComponentFailure + '}';
     }
 }
diff --git a/bitrepository-client/src/main/java/org/bitrepository/client/conversation/ConversationState.java b/bitrepository-client/src/main/java/org/bitrepository/client/conversation/ConversationState.java
index d0543b3fd..a652900f4 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/client/conversation/ConversationState.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/client/conversation/ConversationState.java
@@ -1,23 +1,23 @@
 /*
  * #%L
  * Bitrepository Protocol
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -38,8 +38,9 @@ public interface ConversationState {
 
     /**
      * The general message handler for this state. Will only accept <code>MessageResponses</code>.
-     * Takes care of the general message bookkepping and delegates the specifics of the message handling to the
+     * Takes care of the general message bookkeeping and delegates the specifics of the message handling to the
      * concrete states.
+     *
      * @param message The message to handle.
      */
     void handleMessage(Message message);
diff --git a/bitrepository-client/src/main/java/org/bitrepository/client/conversation/FinishedState.java b/bitrepository-client/src/main/java/org/bitrepository/client/conversation/FinishedState.java
index ef7b6b9dc..f30a6ef79 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/client/conversation/FinishedState.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/client/conversation/FinishedState.java
@@ -1,39 +1,40 @@
 /*
  * #%L
  * Bitrepository Protocol
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.client.conversation;
 
-import java.util.LinkedList;
 import org.bitrepository.bitrepositorymessages.MessageResponse;
 import org.bitrepository.common.exceptions.UnableToFinishException;
 
+import java.util.LinkedList;
+
 /**
  * Marker interface to indicate that this is the finished state for a conversation.
  */
 public class FinishedState extends GeneralConversationState {
     protected final ConversationContext context;
-    
+
     public FinishedState(ConversationContext context) {
         super(new LinkedList<>());
         this.context = context;
@@ -45,17 +46,14 @@ protected ConversationContext getContext() {
     }
 
     @Override
-    public void start(){}
+    public void start() {}
 
     @Override
-    protected GeneralConversationState completeState() throws UnableToFinishException {
+    protected GeneralConversationState completeState() {
         throw new UnsupportedOperationException("No state exists after finished state");
     }
 
     @Override
-    /**
-     * Never timeout.
-     */
     protected long getTimeoutValue() {
         return 0;
     }
diff --git a/bitrepository-client/src/main/java/org/bitrepository/client/conversation/GeneralConversationState.java b/bitrepository-client/src/main/java/org/bitrepository/client/conversation/GeneralConversationState.java
index 17f691111..96d9b939d 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/client/conversation/GeneralConversationState.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/client/conversation/GeneralConversationState.java
@@ -24,12 +24,6 @@
  */
 package org.bitrepository.client.conversation;
 
-import java.util.Collection;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.TimeUnit;
-
 import org.bitrepository.bitrepositorymessages.Message;
 import org.bitrepository.bitrepositorymessages.MessageRequest;
 import org.bitrepository.bitrepositorymessages.MessageResponse;
@@ -41,6 +35,12 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Collection;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
+
 /**
  * Implements the generic conversation state functionality,
  * like timeouts and the definition of the common state attributes.
@@ -70,7 +70,7 @@ protected GeneralConversationState(Collection<String> expectedContributors) {
      */
     public void start() {
         try {
-            if (!responseStatus.getOutstandComponents().isEmpty()) {
+            if (!responseStatus.getOutstandingComponents().isEmpty()) {
                 if (getTimeoutValue() > 0) {
                     scheduledTimeout = timer.schedule(new TimeoutHandler(), getTimeoutValue(), TimeUnit.MILLISECONDS);
                 }
@@ -176,7 +176,7 @@ protected void initializeMessage(MessageRequest msg) {
      * @return the list of components where a identify response hasn't been received.
      */
     protected Collection<String> getOutstandingComponents() {
-        return responseStatus.getOutstandComponents();
+        return responseStatus.getOutstandingComponents();
     }
 
     /** Must be implemented by subclasses to log informative timeout information
diff --git a/bitrepository-client/src/main/java/org/bitrepository/client/conversation/IdentifyingState.java b/bitrepository-client/src/main/java/org/bitrepository/client/conversation/IdentifyingState.java
index a9a763eb3..8e596e76a 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/client/conversation/IdentifyingState.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/client/conversation/IdentifyingState.java
@@ -5,25 +5,22 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.client.conversation;
 
-import java.util.Collection;
-import java.util.LinkedList;
-import java.util.List;
 import org.bitrepository.bitrepositoryelements.ResponseCode;
 import org.bitrepository.bitrepositorymessages.MessageResponse;
 import org.bitrepository.client.conversation.selector.ComponentSelector;
@@ -31,10 +28,14 @@
 import org.bitrepository.client.exceptions.UnexpectedResponseException;
 import org.bitrepository.common.exceptions.UnableToFinishException;
 
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+
 /**
  * Handles the general identifying state functionality. For common usage this class handles all messages by using
- * the sub classe defined <code>selector</code>.
- *
+ * the subclass defined <code>selector</code>.
+ * <p>
  * This class also has a default implementation for the <code>handleStateTimeout()</code>, <code>getNextState()</code>
  * and <code>getTimeoutValue()</code> operations.
  * <code>getNextState()</code>
@@ -92,7 +93,8 @@ protected final ComponentSelector getSelector() {
 
     /**
      * Set the concrete selector from the implementing subclass.
-     * @param customSelector The concrete selector 
+     *
+     * @param customSelector The concrete selector
      */
     protected void setSelector(ComponentSelector customSelector) {
         selector = customSelector;
@@ -107,25 +109,26 @@ protected void setSelector(ComponentSelector customSelector) {
     /**
      * Implements the default handling of failure responses. May be overridden by operation specific behavior,
      * idempotent behavior f.ex,.
+     *
      * @param msg The failure response to handle
      * @throws UnableToFinishException When unable to finish
      */
     protected void handleFailureResponse(MessageResponse msg) throws UnableToFinishException {
         getContext().getMonitor().contributorFailed(
-                msg.getResponseInfo().getResponseText(), msg.getFrom(), 
+                msg.getResponseInfo().getResponseText(), msg.getFrom(),
                 msg.getResponseInfo().getResponseCode());
     }
 
     private void generateContributorsSelectedEvent(Collection<SelectedComponentInfo> selectedComponentInfo) {
         List<String> selectedComponentIDs = new LinkedList<>();
-        for (SelectedComponentInfo componentInfo:selectedComponentInfo) {
+        for (SelectedComponentInfo componentInfo : selectedComponentInfo) {
             selectedComponentIDs.add(componentInfo.getID());
         }
         getContext().getMonitor().contributorsSelected(selectedComponentIDs);
     }
 
     /**
-     * @return An indication whether the identification state can finish, eg. can continue to the operation phase.
+     * @return An indication whether the identification state can finish, e.g. can continue to the operation phase.
      * The default implementation is to return true if at least one a contributor has identified.
      * has been selected. May be overridden by concrete classes.
      */
@@ -136,7 +139,8 @@ protected boolean canFinish() {
     /**
      * Can be used by some operation to mark the responding pillar as checksum pillar if this is relevant for the
      * operation. The default implementation is to do nothing
-     * @param msg The message to check if is coming from a checksumpillar
+     *
+     * @param msg The message to be checked if it is coming from a checksumPillar
      */
     protected void checkForChecksumPillar(MessageResponse msg) {
 
diff --git a/bitrepository-client/src/main/java/org/bitrepository/client/conversation/PerformingOperationState.java b/bitrepository-client/src/main/java/org/bitrepository/client/conversation/PerformingOperationState.java
index 1f02c4f51..cb68ac984 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/client/conversation/PerformingOperationState.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/client/conversation/PerformingOperationState.java
@@ -5,39 +5,40 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.client.conversation;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
 import org.bitrepository.bitrepositoryelements.ResponseCode;
 import org.bitrepository.bitrepositorymessages.MessageResponse;
 import org.bitrepository.client.conversation.selector.SelectedComponentInfo;
 import org.bitrepository.client.exceptions.UnexpectedResponseException;
 import org.bitrepository.common.exceptions.UnableToFinishException;
 
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+
 /**
  * Handles the booking of performing the request phase messaging. Only the specialized workflow steps are required to
  * be implemented the subclass.
  */
 public abstract class PerformingOperationState extends GeneralConversationState {
-    protected Map<String,String> activeContributors;
+    protected Map<String, String> activeContributors;
 
     /**
      * @param expectedContributors The components to perform the actual operation for. The operation is considered
@@ -52,7 +53,7 @@ protected PerformingOperationState(Collection<SelectedComponentInfo> expectedCon
     }
 
     protected PerformingOperationState(String componentID) {
-        super(Arrays.asList(componentID));
+        super(List.of(componentID));
     }
 
     @Override
@@ -67,9 +68,9 @@ protected boolean processMessage(MessageResponse msg) throws UnableToFinishExcep
                 if (msg.getResponseInfo().getResponseCode().equals(ResponseCode.OPERATION_COMPLETED)) {
                     generateContributorCompleteEvent(msg);
                 } else {
-                    isFinalResponse  = handleFailureResponse(msg);
+                    isFinalResponse = handleFailureResponse(msg);
                 }
-            } catch(UnexpectedResponseException ure ) {
+            } catch (UnexpectedResponseException ure) {
                 getContext().getMonitor().warning(ure.getMessage());
             }
         }
@@ -78,8 +79,9 @@ protected boolean processMessage(MessageResponse msg) throws UnableToFinishExcep
 
     @Override
     protected void logStateTimeout() throws UnableToFinishException {
-        throw new UnableToFinishException("Failed to receive responses from all contributors before timeout(" +
-                getTimeoutValue() + "ms). Missing contributors " + getOutstandingComponents());
+        throw new UnableToFinishException(
+                "Failed to receive responses from all contributors before timeout(" + getTimeoutValue() + "ms). Missing contributors " +
+                        getOutstandingComponents());
     }
 
     @Override
@@ -94,13 +96,13 @@ protected GeneralConversationState completeState() throws UnableToFinishExceptio
             return new FinishedState(getContext());
         } else {
             getContext().getMonitor().timeoutRemainingContributors(getOutstandingComponents());
-            throw new UnableToFinishException("All contributors haven't responded. Missing contributors " +
-                    getOutstandingComponents());
+            throw new UnableToFinishException("All contributors haven't responded. Missing contributors " + getOutstandingComponents());
         }
     }
 
     /**
      * Delegating the generation of the COMPLETE_EVENT to the concrete state.
+     *
      * @param msg The final response to process into result event.
      * @throws UnexpectedResponseException Unable to generate a result event based on the supplied message.
      */
@@ -108,22 +110,23 @@ protected GeneralConversationState completeState() throws UnableToFinishExceptio
 
     private static Collection<String> toComponentIDs(Collection<SelectedComponentInfo> contributors) {
         Collection<String> componentIDs = new HashSet<>();
-        for (SelectedComponentInfo componentInfo: contributors) {
+        for (SelectedComponentInfo componentInfo : contributors) {
             componentIDs.add(componentInfo.getID());
         }
         return componentIDs;
     }
+
     /**
-     * Implements the default handling of failure responses which is is to do nothing
+     * Implements the default handling of failure responses which is to do nothing
      * (besides being registered in the event monitor, which is handled by the parent class).
+     *
      * @param msg The failure message to handle
-     * @throws UnableToFinishException if the operation is unable to finish
      * @return true
+     * @throws UnableToFinishException if the operation is unable to finish
      */
     protected boolean handleFailureResponse(MessageResponse msg) throws UnableToFinishException {
-        getContext().getMonitor().contributorFailed(
-                msg.getResponseInfo().getResponseText(), msg.getFrom(), 
-                msg.getResponseInfo().getResponseCode());
+        getContext().getMonitor()
+                .contributorFailed(msg.getResponseInfo().getResponseText(), msg.getFrom(), msg.getResponseInfo().getResponseCode());
         return true;
     }
 }
\ No newline at end of file
diff --git a/bitrepository-client/src/main/java/org/bitrepository/client/conversation/StateBasedConversation.java b/bitrepository-client/src/main/java/org/bitrepository/client/conversation/StateBasedConversation.java
index ac9fd9a24..847c671f9 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/client/conversation/StateBasedConversation.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/client/conversation/StateBasedConversation.java
@@ -1,23 +1,23 @@
 /*
  * #%L
  * Bitrepository Protocol
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -35,8 +35,8 @@
  * receiving specific messages.
  */
 public class StateBasedConversation implements Conversation {
-    private long startTime;
-    private ConversationContext context;
+    private final long startTime;
+    private final ConversationContext context;
 
     /**
      * Initialize a conversation on the given message bus.
@@ -57,7 +57,7 @@ public synchronized void onMessage(Message message, MessageContext messageContex
     public String getConversationID() {
         return context.getConversationID();
     }
-    
+
     @Override
     public long getStartTime() {
         return startTime;
diff --git a/bitrepository-client/src/main/java/org/bitrepository/client/conversation/mediator/CollectionBasedConversationMediator.java b/bitrepository-client/src/main/java/org/bitrepository/client/conversation/mediator/CollectionBasedConversationMediator.java
index 8ee672e92..25a3ca891 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/client/conversation/mediator/CollectionBasedConversationMediator.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/client/conversation/mediator/CollectionBasedConversationMediator.java
@@ -1,36 +1,29 @@
 /*
  * #%L
  * Bitrepository Protocol
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.client.conversation.mediator;
 
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Timer;
-import java.util.TimerTask;
-import java.util.concurrent.ThreadFactory;
-
 import org.bitrepository.bitrepositorymessages.Message;
 import org.bitrepository.client.conversation.Conversation;
 import org.bitrepository.client.eventhandler.ContributorEvent;
@@ -44,28 +37,31 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Timer;
+import java.util.TimerTask;
+import java.util.concurrent.ThreadFactory;
+
 /**
  * Conversation handler that delegates messages to registered conversations.
  */
 public class CollectionBasedConversationMediator implements ConversationMediator {
-    /** Logger for this class. */
     private final Logger log = LoggerFactory.getLogger(getClass());
-    /** Registered conversations, mapping from correlation ID to conversation. */
     private final Map<String, Conversation> conversations;
-    /** The injected settings defining the mediator behavior */
     private final Settings settings;
-    /** Defines that the timer is a daemon thread. */
     private static final Boolean TIMER_IS_DAEMON = true;
-    /** The name of the timer.*/
     private static final String NAME_OF_TIMER = "Collection based conversation timer";
-    /** The timer used to schedule cleaning of conversations.
-     * @see ConversationCleaner 
+    /**
+     * The timer used to schedule cleaning of conversations.
+     *
+     * @see ConversationCleaner
      */
     private static final Timer cleanTimer = new Timer(NAME_OF_TIMER, TIMER_IS_DAEMON);
     private final MessageBus messagebus;
-
-    /** ThreadFactory for any threads the mediator needs to create*/
-    private static final ThreadFactory threadFactory = new DefaultThreadFactory(CollectionBasedConversationMediator.class.getSimpleName()+"-", Thread.NORM_PRIORITY , false);
+    private static final ThreadFactory threadFactory = new DefaultThreadFactory(
+            CollectionBasedConversationMediator.class.getSimpleName() + "-", Thread.NORM_PRIORITY, false);
 
     @Override
     public void start() {
@@ -81,9 +77,9 @@ public void shutdown() {
 
     /**
      * Create a mediator that handles conversations and mediates messages sent on the
-     * given destination on the given messagebus.
+     * given destination on the given messageBus.
      *
-     * @param settings The general client settings.
+     * @param settings        The general client settings.
      * @param securityManager Used by the message bus to authenticate messages.
      */
     public CollectionBasedConversationMediator(Settings settings, SecurityManager securityManager) {
@@ -103,11 +99,12 @@ public void addConversation(Conversation conversation) {
      * Will try to fail a conversation gracefully. This entitles:
      * <ul>
      * <li> Removing the conversation from the list of conversations.
-     * <li> Attempt to call the failConversation operation on the conversation. The call is made in a separate thread to 
+     * <li> Attempt to call the failConversation operation on the conversation. The call is made in a separate thread to
      * avoid having the failing conversation blocking the calling thread.
      * </ul>
+     *
      * @param conversation The conversation to fail.
-     * @param message A message describing the failure symptoms.
+     * @param message      A message describing the failure symptoms.
      */
     private void failConversation(final Conversation conversation, final String message) {
         String conversationID = conversation.getConversationID();
@@ -118,14 +115,13 @@ private void failConversation(final Conversation conversation, final String mess
             t.start();
         }
     }
-    
+
     /**
      * @param message The message with the unknown conversation ID.
      */
     private void handleUnknownConversation(Message message) {
-        log.debug(message.getClass().getSimpleName() + " from " + message.getFrom() +
-            " with correlationID '" + message.getCorrelationID() + "' could not be delegated to any " +
-                "conversation.");
+        log.debug(message.getClass().getSimpleName() + " from " + message.getFrom() + " with correlationID '" + message.getCorrelationID() +
+                "' could not be delegated to any " + "conversation.");
     }
 
     @Override
@@ -138,58 +134,60 @@ public void onMessage(Message message, MessageContext messageContext) {
             handleUnknownConversation(message);
         }
     }
-    
+
     /**
-     * Will clean out obsolete conversations in each run. An obsolete conversation is a conversation which satisfies on 
+     * Will clean out obsolete conversations in each run. An obsolete conversation is a conversation which satisfies on
      * of the following criterias: <ol>
      * <li> Returns true for the <code>hasEnded()</code> method.
      * <li> Is older than the conversationTImeout limit allows.
      * </ol>
-     * 
+     * <p>
      * A copy of the current conversations is created before running through the conversations to avoid having to lock
      * the conversations map while cleaning.
      */
     private final class ConversationCleaner extends TimerTask {
         @Override
         public void run() {
-            Conversation[] conversationArray = 
-                    conversations.values().toArray(new Conversation[conversations.size()]);
+            Conversation[] conversationArray = conversations.values().toArray(new Conversation[0]);
             long currentTime = System.currentTimeMillis();
-            for (Conversation conversation: conversationArray) {
-                if (conversation.hasEnded()) { 
+            for (Conversation conversation : conversationArray) {
+                if (conversation.hasEnded()) {
                     conversations.remove(conversation.getConversationID());
-                } else if (currentTime - conversation.getStartTime() > 
-                settings.getReferenceSettings().getClientSettings().getConversationTimeout().longValue()) {
-                    log.warn("Failing timed out conversation " + conversation.getConversationID() + " " +
-                    		"(Age " + (currentTime - conversation.getStartTime()) + "ms)");
-                    failConversation(conversation, 
-                            "Failing timed out conversation " + conversation.getConversationID());
+                } else if (currentTime - conversation.getStartTime() >
+                        settings.getReferenceSettings().getClientSettings().getConversationTimeout().longValue()) {
+                    log.warn("Failing timed out conversation " + conversation.getConversationID() + " " + "(Age " +
+                            (currentTime - conversation.getStartTime()) + "ms)");
+                    failConversation(conversation, "Failing timed out conversation " + conversation.getConversationID());
                 }
             }
-        }       
+        }
     }
-    
+
     /**
      * Thread for handling the failing of a conversation.
      */
     private static class FailingConversation implements Runnable {
-        /** The conversation to fail.*/
+        /**
+         * The conversation to fail.
+         */
         private final Conversation conversation;
-        /** The message telling the reason for the conversation to fail.*/
+        /**
+         * The message telling the reason for the conversation to fail.
+         */
         private final String message;
+
         /**
          * @param conversation The conversation to fail.
-         * @param message The reason for the conversation to fail.
+         * @param message      The reason for the conversation to fail.
          */
         FailingConversation(Conversation conversation, String message) {
             this.conversation = conversation;
             this.message = message;
         }
-        
+
         @Override
         public void run() {
-            OperationFailedEvent failedEvent = new OperationFailedEvent(null, message, 
-                    Collections.<ContributorEvent>emptyList());
+            OperationFailedEvent failedEvent = new OperationFailedEvent(null, message, Collections.<ContributorEvent>emptyList());
             failedEvent.setConversationID(conversation.getConversationID());
             conversation.failConversation(failedEvent);
         }
diff --git a/bitrepository-client/src/main/java/org/bitrepository/client/conversation/mediator/ConversationMediator.java b/bitrepository-client/src/main/java/org/bitrepository/client/conversation/mediator/ConversationMediator.java
index a0fe33304..afa8d93c6 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/client/conversation/mediator/ConversationMediator.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/client/conversation/mediator/ConversationMediator.java
@@ -1,23 +1,23 @@
 /*
  * #%L
  * Bitrepository Protocol
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -29,17 +29,17 @@
 
 /**
  * Keeps track of conversations.
- *
+ * <p>
  * Must listen delegate messages to the correct conversations.
  */
 public interface ConversationMediator extends MessageListener {
     /**
-     * Will begin listning for messages on the message bus.
+     * Will begin listening for messages on the message bus.
      */
     void start();
 
     /**
-     * Will stop this <code>ConversationMediator</code> from listening to the message bus.
+     * Will stop this {@link ConversationMediator} from listening to the message bus.
      */
     void shutdown();
 
diff --git a/bitrepository-client/src/main/java/org/bitrepository/client/conversation/mediator/ConversationMediatorManager.java b/bitrepository-client/src/main/java/org/bitrepository/client/conversation/mediator/ConversationMediatorManager.java
index 9eb393203..be2bbeeb9 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/client/conversation/mediator/ConversationMediatorManager.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/client/conversation/mediator/ConversationMediatorManager.java
@@ -1,53 +1,49 @@
 /*
  * #%L
  * Bitrepository Protocol
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.client.conversation.mediator;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import org.bitrepository.common.settings.Settings;
 import org.bitrepository.protocol.security.SecurityManager;
 
-/** 
+import java.util.HashMap;
+import java.util.Map;
+
+/**
  * Get your <code>ConversationMediator</code> here.
  */
 public class ConversationMediatorManager {
     public static final String DEFAULT_MEDIATOR = "Default mediator";
+    private static final Map<String, ConversationMediator> mediatorMap = new HashMap<>();
+
+    private ConversationMediatorManager() {}
 
-    /** Map of the loaded mediators */
-    private static final Map<String,ConversationMediator> mediatorMap = new HashMap<>();
-    
-    /**
-     * Private constructor. To prevent instantiation of this utility class.
-     */
-    private ConversationMediatorManager() { }
-    
     /**
-     * Will return a the <code>ConversationMediator</code> for the collection indicated in the settings. 
+     * Will return a the <code>ConversationMediator</code> for the collection indicated in the settings.
      * If the mediator does doesn't exist, it will be created.
-     * @param settings The settings to use for this mediator.
+     *
+     * @param settings        The settings to use for this mediator.
      * @param securityManager The securityManager to use for this conversation mediator.
      * @return The settings for the indicated CollectionID.
      */
@@ -59,9 +55,9 @@ public static synchronized ConversationMediator getConversationMediator(Settings
         return mediatorMap.get(DEFAULT_MEDIATOR);
     }
 
-
     /**
      * Can be used to inject a custom messageBus for the efault mediator.
+     *
      * @param mediator The custom instance of the mediator.
      */
     public static void injectCustomConversationMediator(ConversationMediator mediator) {
diff --git a/bitrepository-client/src/main/java/org/bitrepository/client/conversation/selector/ComponentSelector.java b/bitrepository-client/src/main/java/org/bitrepository/client/conversation/selector/ComponentSelector.java
index 78e2bdd0a..ad19571ff 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/client/conversation/selector/ComponentSelector.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/client/conversation/selector/ComponentSelector.java
@@ -1,42 +1,46 @@
 /*
  * #%L
  * Bitrepository Protocol
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.client.conversation.selector;
 
-import java.util.HashSet;
-import java.util.Set;
 import org.bitrepository.bitrepositorymessages.MessageResponse;
 import org.bitrepository.client.exceptions.UnexpectedResponseException;
 
-/** Can be used to select a single component to run an operation on by handling the identify responses. <p>
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * Can be used to select a single component to run an operation on, by handling identify responses. <p>
  * The algorithm for selecting the component is implemented in the concrete classes.
  */
 public class ComponentSelector {
-    /** Used for tracking who has answered. */
+    /**
+     * Used for tracking who has answered.
+     */
     protected final Set<SelectedComponentInfo> selectedComponents = new HashSet<>();
 
-    public void  selectComponent(MessageResponse response) throws UnexpectedResponseException {
+    public void selectComponent(MessageResponse response) throws UnexpectedResponseException {
         selectedComponents.add(new SelectedComponentInfo(response.getFrom(), response.getReplyTo()));
     }
 
diff --git a/bitrepository-client/src/main/java/org/bitrepository/client/conversation/selector/ContributorResponseStatus.java b/bitrepository-client/src/main/java/org/bitrepository/client/conversation/selector/ContributorResponseStatus.java
index 9c3dc519b..88d3d825b 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/client/conversation/selector/ContributorResponseStatus.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/client/conversation/selector/ContributorResponseStatus.java
@@ -1,40 +1,42 @@
 /*
  * #%L
  * Bitrepository Protocol
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.client.conversation.selector;
 
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
 import org.bitrepository.bitrepositorymessages.MessageResponse;
-import org.bitrepository.client.exceptions.UnexpectedResponseException;
 import org.bitrepository.protocol.utils.MessageUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/** Models the response state for a given set of components */
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * Models the response state for a given set of components
+ */
 public class ContributorResponseStatus {
     private final Logger log = LoggerFactory.getLogger(this.getClass());
     private final Set<String> componentsWhichShouldRespond;
@@ -42,7 +44,8 @@ public class ContributorResponseStatus {
 
     /**
      * Use for identify response bookkeeping.
-     * @param componentsWhichShouldRespond An array of componentIDs specifying which components are expected to respond 
+     *
+     * @param componentsWhichShouldRespond An array of componentIDs specifying which components are expected to respond
      */
     public ContributorResponseStatus(Collection<String> componentsWhichShouldRespond) {
         this.componentsWhichShouldRespond = new HashSet<>(componentsWhichShouldRespond);
@@ -51,6 +54,7 @@ public ContributorResponseStatus(Collection<String> componentsWhichShouldRespond
 
     /**
      * Maintains the bookkeeping regarding which components have responded.
+     *
      * @param response the response that was received
      */
     public final void responseReceived(MessageResponse response) {
@@ -59,8 +63,7 @@ public final void responseReceived(MessageResponse response) {
             log.debug("Received response from: " + componentID);
             if (componentsWithOutstandingResponse.contains(componentID)) {
                 componentsWithOutstandingResponse.remove(componentID);
-            } else if (!componentsWithOutstandingResponse.contains(componentID) &&
-                    componentsWhichShouldRespond.contains(componentID)) {
+            } else if (!componentsWithOutstandingResponse.contains(componentID) && componentsWhichShouldRespond.contains(componentID)) {
                 log.debug("Received more than one response from component " + componentID);
             } else {
                 log.debug("Received response from irrelevant component " + componentID);
@@ -68,10 +71,12 @@ public final void responseReceived(MessageResponse response) {
         }
     }
 
-    /** Get components where a identify response hasn't been received.
-     * @return a list of components where a identify response hasn't been received.
-     * */
-    public Collection<String> getOutstandComponents() {
+    /**
+     * Get components where identify response hasn't been received.
+     *
+     * @return a list of components where identify response hasn't been received.
+     */
+    public Collection<String> getOutstandingComponents() {
         return Collections.unmodifiableCollection(componentsWithOutstandingResponse);
     }
 
@@ -79,7 +84,8 @@ public Collection<String> getOutstandComponents() {
      * @return true if all components have responded. False otherwise
      */
     public final boolean haveAllComponentsResponded() {
-        log.debug("Expected contributors: " + componentsWhichShouldRespond + ", components that have not answered: " + componentsWithOutstandingResponse);
+        log.debug("Expected contributors: " + componentsWhichShouldRespond + ", components that have not answered: " +
+                componentsWithOutstandingResponse);
         return componentsWithOutstandingResponse.isEmpty();
     }
 
diff --git a/bitrepository-client/src/main/java/org/bitrepository/client/conversation/selector/SelectedComponentInfo.java b/bitrepository-client/src/main/java/org/bitrepository/client/conversation/selector/SelectedComponentInfo.java
index 45b6af24d..de61b6302 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/client/conversation/selector/SelectedComponentInfo.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/client/conversation/selector/SelectedComponentInfo.java
@@ -1,23 +1,23 @@
 /*
  * #%L
  * Bitrepository Protocol
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -28,13 +28,17 @@
  * Container for information about a pillar which as been identified and are marked as selected for a request.
  */
 public class SelectedComponentInfo {
-    /** The ID of the selected pillar */
+    /**
+     * The ID of the selected pillar
+     */
     protected final String componentID;
-    /** The topic for communication with the selected pillar */
-    protected final String componentTopic;   
+    /**
+     * The topic for communication with the selected pillar
+     */
+    protected final String componentTopic;
 
     /**
-     * @param componentID The ID of the pillar
+     * @param componentID    The ID of the pillar
      * @param componentTopic the topic for communication with the selected pillar
      */
     public SelectedComponentInfo(String componentID, String componentTopic) {
@@ -43,18 +47,20 @@ public SelectedComponentInfo(String componentID, String componentTopic) {
         this.componentTopic = componentTopic;
     }
 
-    /** @return The ID of the pillar chosen by this selector if finished. If unfinished null is returned */
+    /**
+     * @return The ID of the pillar chosen by this selector if finished. If unfinished null is returned
+     */
     public String getID() {
         return componentID;
     }
 
-    /** 
-     * @return If finished return the topic for sending messages to the pillar chosen by this selector. 
-     * If unfinished null is returned 
+    /**
+     * @return If finished return the topic for sending messages to the pillar chosen by this selector.
+     * If unfinished null is returned
      */
     public String getDestination() {
         return componentTopic;
-    }  
+    }
 
     @Override
     public String toString() {
diff --git a/bitrepository-client/src/main/java/org/bitrepository/client/eventhandler/AbstractOperationEvent.java b/bitrepository-client/src/main/java/org/bitrepository/client/eventhandler/AbstractOperationEvent.java
index 3287e976f..c4f89977b 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/client/eventhandler/AbstractOperationEvent.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/client/eventhandler/AbstractOperationEvent.java
@@ -1,23 +1,23 @@
 /*
  * #%L
  * Bitrepository Protocol
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -37,15 +37,15 @@ public abstract class AbstractOperationEvent implements OperationEvent {
     private String conversationID;
     private String collectionID;
 
-    @Override 
+    @Override
     public String getCollectionID() {
         return collectionID;
     }
-    
+
     public void setCollectionID(String collectionID) {
         this.collectionID = collectionID;
     }
-    
+
     @Override
     public String getInfo() {
         return info;
@@ -60,6 +60,7 @@ public OperationEventType getEventType() {
     public OperationType getOperationType() {
         return operationType;
     }
+
     @Override
     public String getFileID() {
         return fileID;
@@ -70,29 +71,33 @@ public String getConversationID() {
         return conversationID;
     }
 
-    /** @see #getEventType 
+    /**
      * @param type The {@link OperationEventType}  to set as the event type
+     * @see #getEventType
      */
     public void setEventType(OperationEventType type) {
         this.type = type;
     }
 
-    /** @see #getOperationType 
-     * @param operationType The {@link OperationType} to set as the operation type 
+    /**
+     * @param operationType The {@link OperationType} to set as the operation type
+     * @see #getOperationType
      */
     public void setOperationType(OperationType operationType) {
         this.operationType = operationType;
     }
 
-    /** @see #getFileID 
-     * @param fileID The ID of the file 
+    /**
+     * @param fileID The ID of the file
+     * @see #getFileID
      */
     public void setFileID(String fileID) {
         this.fileID = fileID;
     }
 
-    /** @see #getInfo 
-     * @param info The content of the info field 
+    /**
+     * @param info The content of the info field
+     * @see #getInfo
      */
     public void setInfo(String info) {
         this.info = info;
@@ -108,21 +113,21 @@ public void setConversationID(String conversationID) {
     @Override
     public final String toString() {
         StringBuilder sb = new StringBuilder();
-        sb.append(getConversationID() + ": ");
+        sb.append(getConversationID()).append(": ");
         sb.append(operationType);
         if (fileID != null) {
-            sb.append(" for file " + fileID);
+            sb.append(" for file ").append(fileID);
         }
-        sb.append(": " + getEventType() + ": ");
+        sb.append(": ").append(getEventType()).append(": ");
         if (additionalInfo() != null) {
             sb.append(additionalInfo());
         }
         if (getInfo() != null) {
-            sb.append(", " + getInfo());
+            sb.append(", ").append(getInfo());
         }
         return sb.toString();
     }
-    
+
     /**
      * @return The additional information in a string form. The string returned will be appended to the toString value.
      */
diff --git a/bitrepository-client/src/main/java/org/bitrepository/client/eventhandler/BlockingEventHandler.java b/bitrepository-client/src/main/java/org/bitrepository/client/eventhandler/BlockingEventHandler.java
index 76d16fd49..1db4364fc 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/client/eventhandler/BlockingEventHandler.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/client/eventhandler/BlockingEventHandler.java
@@ -1,21 +1,21 @@
 package org.bitrepository.client.eventhandler;
 /*
  * #%L
- * Bitrepository Client
+ * BitRepository Client
  * %%
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -25,20 +25,16 @@
 import java.util.List;
 
 /**
- * Eventhandler wrapper enabling blocking behavior for clients. Can pass events on to a supplied eventhandler.
+ * EventHandler wrapper enabling blocking behavior for clients. Can pass events on to a supplied EventHandler.
  */
 public class BlockingEventHandler implements EventHandler {
     private final EventHandler eventHandler;
     private OperationEvent finishEvent;
-    private List<ContributorEvent> componentCompleteEvents = new LinkedList<>();
-    private List<ContributorFailedEvent> componentFailedEvents = new LinkedList<>();
-
-    public BlockingEventHandler() {
-        eventHandler = null;
-    }
+    private final List<ContributorEvent> componentCompleteEvents = new LinkedList<>();
+    private final List<ContributorFailedEvent> componentFailedEvents = new LinkedList<>();
 
     /**
-     * @param eventHandler The eventhandler to pass event on to.
+     * @param eventHandler The EventHandler to pass event on to.
      */
     public BlockingEventHandler(EventHandler eventHandler) {
         this.eventHandler = eventHandler;
@@ -50,12 +46,12 @@ public synchronized void handleEvent(OperationEvent event) {
             eventHandler.handleEvent(event);
         }
 
-        if (event.getEventType() ==  OperationEvent.OperationEventType.COMPONENT_COMPLETE) {
-            componentCompleteEvents.add((ContributorEvent)event);
+        if (event.getEventType() == OperationEvent.OperationEventType.COMPONENT_COMPLETE) {
+            componentCompleteEvents.add((ContributorEvent) event);
         } else if (event.getEventType() == OperationEvent.OperationEventType.COMPONENT_FAILED) {
-            componentFailedEvents.add((ContributorFailedEvent)event);
-        } else if(event.getEventType() == OperationEvent.OperationEventType.COMPLETE ||
-                event.getEventType() == OperationEvent.OperationEventType.FAILED    ) {
+            componentFailedEvents.add((ContributorFailedEvent) event);
+        } else if (event.getEventType() == OperationEvent.OperationEventType.COMPLETE ||
+                event.getEventType() == OperationEvent.OperationEventType.FAILED) {
             finishEvent = event;
             this.notify();
         }
@@ -63,6 +59,7 @@ public synchronized void handleEvent(OperationEvent event) {
 
     /**
      * Will block until a <code>COMPLETE</code> or <code>FAILED</code> event is received.
+     *
      * @return the operationEvent
      */
     public synchronized OperationEvent awaitFinished() {
@@ -73,13 +70,10 @@ public synchronized OperationEvent awaitFinished() {
         return finishEvent;
     }
 
-    public boolean hasFailed() {
-        return componentFailedEvents.size() > 0;
-    }
-
     public List<ContributorFailedEvent> getFailures() {
         return componentFailedEvents;
     }
+
     public List<ContributorEvent> getResults() {
         return componentCompleteEvents;
     }
diff --git a/bitrepository-client/src/main/java/org/bitrepository/client/eventhandler/CompleteEvent.java b/bitrepository-client/src/main/java/org/bitrepository/client/eventhandler/CompleteEvent.java
index 912a09abc..4989af39e 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/client/eventhandler/CompleteEvent.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/client/eventhandler/CompleteEvent.java
@@ -1,23 +1,23 @@
 /*
  * #%L
  * Bitrepository Protocol
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -28,17 +28,19 @@
 import java.util.List;
 
 /**
- * Indicates a operation has completed successfully.
+ * Indicates that an operation has completed successfully.
  */
 public class CompleteEvent extends AbstractOperationEvent {
-    /** See {@link #getInfo()}*/
+    /**
+     * See {@link #getInfo()}
+     */
     private final List<ContributorEvent> componentResults;
 
     /**
-     * @param collectionID the collection ID
+     * @param collectionID     the collection ID
      * @param componentResults The aggregated list of <code>COMPONENT_COMPLETE</code> events generated during
      *                         the operation.
-    */
+     */
     public CompleteEvent(String collectionID, List<ContributorEvent> componentResults) {
         super();
         setCollectionID(collectionID);
diff --git a/bitrepository-client/src/main/java/org/bitrepository/client/eventhandler/ContributorCompleteEvent.java b/bitrepository-client/src/main/java/org/bitrepository/client/eventhandler/ContributorCompleteEvent.java
index f8b1dc395..925d47703 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/client/eventhandler/ContributorCompleteEvent.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/client/eventhandler/ContributorCompleteEvent.java
@@ -1,21 +1,21 @@
 package org.bitrepository.client.eventhandler;
 /*
  * #%L
- * Bitrepository Client
+ * BitRepository Client
  * %%
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
diff --git a/bitrepository-client/src/main/java/org/bitrepository/client/eventhandler/ContributorEvent.java b/bitrepository-client/src/main/java/org/bitrepository/client/eventhandler/ContributorEvent.java
index fae45a051..b9db0305a 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/client/eventhandler/ContributorEvent.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/client/eventhandler/ContributorEvent.java
@@ -1,23 +1,23 @@
 /*
  * #%L
  * Bitrepository Protocol
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -29,10 +29,10 @@
  */
 public class ContributorEvent extends AbstractOperationEvent {
     private final String contributorID;
-    
+
     /**
      * @param contributorID The contributorID for which this event concerns.
-     * @param collectionID the collectionID for which this event concerns.
+     * @param collectionID  the collectionID for which this event concerns.
      */
     public ContributorEvent(String contributorID, String collectionID) {
         super();
diff --git a/bitrepository-client/src/main/java/org/bitrepository/client/eventhandler/ContributorFailedEvent.java b/bitrepository-client/src/main/java/org/bitrepository/client/eventhandler/ContributorFailedEvent.java
index 6943975bb..44e02a977 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/client/eventhandler/ContributorFailedEvent.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/client/eventhandler/ContributorFailedEvent.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -30,9 +30,9 @@ public class ContributorFailedEvent extends ContributorEvent {
 
     /**
      * @param contributorID the contributor
-     * @param collectionID the collection
-     * @param responseCode The response code from any response indicating the failure. Might be null, if no relevant
-     *                     response exists.
+     * @param collectionID  the collection
+     * @param responseCode  The response code from any response indicating the failure. Might be null, if no relevant
+     *                      response exists.
      */
     public ContributorFailedEvent(String contributorID, String collectionID, ResponseCode responseCode) {
         super(contributorID, collectionID);
diff --git a/bitrepository-client/src/main/java/org/bitrepository/client/eventhandler/DefaultEvent.java b/bitrepository-client/src/main/java/org/bitrepository/client/eventhandler/DefaultEvent.java
index 7615265e1..d59e5a8c0 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/client/eventhandler/DefaultEvent.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/client/eventhandler/DefaultEvent.java
@@ -1,37 +1,39 @@
 /*
  * #%L
  * Bitrepository Protocol
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.client.eventhandler;
 
-/** A general type of <code>OperationEvent</code> only containing a descriptive info message. */
+/**
+ * A general type of <code>OperationEvent</code> only containing a descriptive info message.
+ */
 public class DefaultEvent extends AbstractOperationEvent {
 
     public DefaultEvent(String collectionID) {
         super();
         setCollectionID(collectionID);
     }
-    
+
     @Override
     public String additionalInfo() {
         return "";
diff --git a/bitrepository-client/src/main/java/org/bitrepository/client/eventhandler/EventHandler.java b/bitrepository-client/src/main/java/org/bitrepository/client/eventhandler/EventHandler.java
index 996f83ef0..13ea84aec 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/client/eventhandler/EventHandler.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/client/eventhandler/EventHandler.java
@@ -1,23 +1,23 @@
 /*
  * #%L
  * Bitrepository Protocol
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -25,15 +25,16 @@
 package org.bitrepository.client.eventhandler;
 
 /**
- * Defines the interface for clients to follow the sequence of events unfolding after a operation on the bitrepository 
+ * Defines the interface for clients to follow the sequence of events unfolding after a operation on the BitRepository
  * has been requested.
- * 
- * A user interested in following the status a of request should create an <code>EventHandler</code> and supply the 
+ * <p>
+ * To follow the status of a request, create an <code>EventHandler</code> and supply the
  * EventHandler when call the relevant method on the client.
  */
 public interface EventHandler {
     /**
      * Called by the client each time a event is detected relevant for the active operation
+     *
      * @param event Contains information about the concrete event.
      */
     void handleEvent(OperationEvent event);
diff --git a/bitrepository-client/src/main/java/org/bitrepository/client/eventhandler/IdentificationCompleteEvent.java b/bitrepository-client/src/main/java/org/bitrepository/client/eventhandler/IdentificationCompleteEvent.java
index ef37cd50c..180cd4037 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/client/eventhandler/IdentificationCompleteEvent.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/client/eventhandler/IdentificationCompleteEvent.java
@@ -1,23 +1,23 @@
 /*
  * #%L
  * Bitrepository Protocol
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -33,7 +33,7 @@ public class IdentificationCompleteEvent extends AbstractOperationEvent {
     private final List<String> contributorIDs;
 
     /**
-     * @param collectionID the collection ID for the event
+     * @param collectionID   the collection ID for the event
      * @param contributorIDs The list of IDs of the contributor this event relates to.
      */
     public IdentificationCompleteEvent(String collectionID, List<String> contributorIDs) {
@@ -44,12 +44,12 @@ public IdentificationCompleteEvent(String collectionID, List<String> contributor
     }
 
     /**
-     * @return  the ID of the pillar this event relates to.
+     * @return the ID of the pillar this event relates to.
      */
     public List<String> getContributorIDs() {
         return contributorIDs;
     }
-    
+
     @Override
     public String additionalInfo() {
         return "Contributors: " + getContributorIDs();
diff --git a/bitrepository-client/src/main/java/org/bitrepository/client/eventhandler/OperationEvent.java b/bitrepository-client/src/main/java/org/bitrepository/client/eventhandler/OperationEvent.java
index adf120cea..baab40e6e 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/client/eventhandler/OperationEvent.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/client/eventhandler/OperationEvent.java
@@ -1,23 +1,23 @@
 /*
  * #%L
  * Bitrepository Protocol
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -33,10 +33,10 @@ public interface OperationEvent {
     /**
      * Defines the different types of events that can be received. These are:<ol>
      * <li>PillarIdentified: An identify response has been received from a pillar.
-     * <li>PillarSelected: Enough responses has now been received from pillar to select a pillar to perform the 
+     * <li>PillarSelected: Enough responses has now been received from pillar to select a pillar to perform the
      * operation on.
-     * <li>RequestSent: A request for the operation has ben sent to the relevant pillar(s). 
-     * <li>Progress: In case of longer operations (e.g. requiring file transfers) progress information might be 
+     * <li>RequestSent: A request for the operation has ben sent to the relevant pillar(s).
+     * <li>Progress: In case of longer operations (e.g. requiring file transfers) progress information might be
      * received from the pillars.
      * <li>PartiallyComplete: The cases when part of the operation has been completed (e.g. when the operation has been
      * to be performed at several pillars, and it has been completed on one of them).
@@ -45,42 +45,36 @@ public interface OperationEvent {
      * The following error types exist:<ol>
      * <li>Failed: A general failure occurred during the operation
      * <li>NoPillarFound: No relevant response was received before a timeout occurred.
-     * <li>TimeOut: The operation did't finish before a timeout occurred.
+     * <li>TimeOut: The operation didn't finish before a timeout occurred.
      * </ol>
      */
     enum OperationEventType {
-        IDENTIFY_REQUEST_SENT,
-        COMPONENT_IDENTIFIED,
-        IDENTIFICATION_COMPLETE,
-        REQUEST_SENT,
-        PROGRESS,
-        COMPONENT_COMPLETE,
-        COMPLETE, 
-        COMPONENT_FAILED,
-        FAILED,
-        IDENTIFY_TIMEOUT, 
-        WARNING 
+        IDENTIFY_REQUEST_SENT, COMPONENT_IDENTIFIED, IDENTIFICATION_COMPLETE, REQUEST_SENT, PROGRESS, COMPONENT_COMPLETE, COMPLETE,
+        COMPONENT_FAILED, FAILED, IDENTIFY_TIMEOUT, WARNING
     }
-    
+
     /**
      * @return A string representation of what has happened
      */
     String getInfo();
-    
+
     /**
      * Used to get the type of event.
+     *
      * @return A <code>OperationEventType</code> categorizing this event.
      */
     OperationEventType getEventType();
 
     /**
      * Used to get the type of operation.
+     *
      * @return A <code>OperationEventType</code> categorizing this event.
      */
     OperationType getOperationType();
 
     /**
      * Used to get the fileID this operation is performed on, if any.
+     *
      * @return A <code>OperationEventType</code> categorizing this event.
      */
     String getFileID();
@@ -89,9 +83,9 @@ enum OperationEventType {
      * @return The conversation ID of the event.
      */
     String getConversationID();
-    
+
     /**
-     * @return The ID of the collection that the  
+     * @return The ID of the collection that the
      */
     String getCollectionID();
 }
diff --git a/bitrepository-client/src/main/java/org/bitrepository/client/eventhandler/OperationFailedEvent.java b/bitrepository-client/src/main/java/org/bitrepository/client/eventhandler/OperationFailedEvent.java
index 522e42872..0e2f5f46a 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/client/eventhandler/OperationFailedEvent.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/client/eventhandler/OperationFailedEvent.java
@@ -1,23 +1,23 @@
 /*
  * #%L
  * Bitrepository Protocol
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -34,8 +34,8 @@ public class OperationFailedEvent extends AbstractOperationEvent {
     private final List<ContributorEvent> componentResults;
 
     /**
-     * @param collectionID the collection ID
-     * @param info See {@link #getInfo()}
+     * @param collectionID     the collection ID
+     * @param info             See {@link #getInfo()}
      * @param componentResults The aggregated list of <code>COMPONENT_COMPLETE</code> events generated during
      *                         the operation.
      */
@@ -47,7 +47,7 @@ public OperationFailedEvent(String collectionID, String info, List<ContributorEv
     }
 
     /**
-     * @return  the results for the individual components contributing to this operation. The list is just
+     * @return the results for the individual components contributing to this operation. The list is just
      * aggregation of the <code>COMPONENT_COMPLETE</code> events generated during the operation.
      */
     public List<ContributorEvent> getComponentResults() {
@@ -58,5 +58,5 @@ public List<ContributorEvent> getComponentResults() {
     public String additionalInfo() {
         return "";
     }
-    
+
 }
diff --git a/bitrepository-client/src/main/java/org/bitrepository/client/exceptions/NegativeResponseException.java b/bitrepository-client/src/main/java/org/bitrepository/client/exceptions/NegativeResponseException.java
index e91a695ed..3a310c19d 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/client/exceptions/NegativeResponseException.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/client/exceptions/NegativeResponseException.java
@@ -1,23 +1,23 @@
 /*
  * #%L
  * Bitrepository Protocol
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -32,22 +32,23 @@
  */
 @SuppressWarnings("serial")
 public class NegativeResponseException extends Exception {
-    private final ResponseCode errorcode;
+    private final ResponseCode errorCode;
 
     /**
      * Constructor with both message and cause exception
-     * @param message Human readable description of this exception
-     * @param errorcode The errorcode causing the exception.
+     *
+     * @param message   Description of this exception in
+     * @param errorCode The error code causing the exception.
      */
-    public NegativeResponseException(String message, ResponseCode errorcode) {
+    public NegativeResponseException(String message, ResponseCode errorCode) {
         super(message);
-        this.errorcode = errorcode;
+        this.errorCode = errorCode;
     }
 
     /**
-     * @return The errorcode causing the exception.
+     * @return The error code causing the exception.
      */
-    public ResponseCode getErrorcode() {
-        return errorcode;
-    }  
+    public ResponseCode getErrorCode() {
+        return errorCode;
+    }
 }
diff --git a/bitrepository-client/src/main/java/org/bitrepository/client/exceptions/UnexpectedResponseException.java b/bitrepository-client/src/main/java/org/bitrepository/client/exceptions/UnexpectedResponseException.java
index 6a9972301..8981e1fd0 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/client/exceptions/UnexpectedResponseException.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/client/exceptions/UnexpectedResponseException.java
@@ -1,23 +1,23 @@
 /*
  * #%L
  * Bitrepository Protocol
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -25,21 +25,23 @@
 package org.bitrepository.client.exceptions;
 
 /**
- * Used to indicate that an negative reponse has been received.
+ * Used to indicate that a negative response has been received.
  */
 @SuppressWarnings("serial")
 public class UnexpectedResponseException extends Exception {
     /**
      * Constructor with both message and cause exception
+     *
      * @param message of this exception
-     * @param cause The throwable causing of the exception
+     * @param cause   The throwable causing of the exception
      */
     public UnexpectedResponseException(String message, Throwable cause) {
         super(message, cause);
     }
 
     /**
-     * Constructor with only a message 
+     * Constructor with only a message
+     *
      * @param message of this exception
      */
     public UnexpectedResponseException(String message) {
diff --git a/bitrepository-client/src/main/java/org/bitrepository/commandline/CommandLineClient.java b/bitrepository-client/src/main/java/org/bitrepository/commandline/CommandLineClient.java
index 57aa537e8..647d84359 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/commandline/CommandLineClient.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/commandline/CommandLineClient.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -22,15 +22,6 @@
 
 package org.bitrepository.commandline;
 
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.security.NoSuchAlgorithmException;
-import java.util.Arrays;
-import java.util.List;
-
-import javax.jms.JMSException;
-
 import org.apache.commons.cli.Option;
 import org.apache.commons.cli.ParseException;
 import org.bitrepository.bitrepositoryelements.ChecksumDataForFileTYPE;
@@ -51,15 +42,28 @@
 import org.bitrepository.protocol.messagebus.MessageBusManager;
 import org.bitrepository.protocol.security.SecurityManager;
 
+import javax.jms.JMSException;
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.security.NoSuchAlgorithmException;
+import java.util.List;
+
 /**
  * Defines the common functionality for command-line-clients.
  */
 public abstract class CommandLineClient {
     private final String componentID;
+    protected final OutputHandler output = new DefaultOutputHandler(getClass());
+    protected final Settings settings;
+    protected final SecurityManager securityManager;
+    protected final CommandLineArgumentsHandler cmdHandler;
+    private final FileIDValidator fileIDValidator;
 
     /**
-     * Runs a specific command-line-client operation. 
+     * Runs a specific command-line-client operation.
      * Handles also the closing of connections and deals with exceptions.
+     *
      * @throws Exception if an error occurs
      */
     public void runCommand() throws Exception {
@@ -75,31 +79,19 @@ public void runCommand() throws Exception {
         }
     }
 
-    /** For handling the output.*/
-    protected final OutputHandler output = new DefaultOutputHandler(getClass());
-
-    /** The settings for the client.*/
-    protected final Settings settings;
-    /** The security manager.*/
-    protected final SecurityManager securityManager;
-    /** The handler for the command line arguments.*/
-    protected final CommandLineArgumentsHandler cmdHandler;
-    private final FileIDValidator fileIDValidator;
-
     /**
      * @param args The generic command line arguments for defining the operation.
      */
-    protected CommandLineClient(String ... args) {
+    protected CommandLineClient(String... args) {
         cmdHandler = new CommandLineArgumentsHandler();
         createOptionsForCmdArgumentHandler();
         try {
             cmdHandler.parseArguments(args);
         } catch (ParseException pe) {
-            output.error(cmdHandler.listArguments() +
-                    "Missing argument: " + pe.getMessage());
+            output.error(cmdHandler.listArguments() + "Missing argument: " + pe.getMessage());
             throw new IllegalArgumentException("Missing arguments", pe);
         }
-        if(cmdHandler.hasOption(Constants.VERBOSITY_ARG)) {
+        if (cmdHandler.hasOption(Constants.VERBOSITY_ARG)) {
             output.setVerbosity(true);
         }
         settings = cmdHandler.loadSettings();
@@ -124,6 +116,7 @@ protected CommandLineClient(String ... args) {
 
     /**
      * Defines the componentID of the concrete client. Must be specified by in the subclass.
+     *
      * @return The componentID of the concrete client.
      */
     protected String getComponentID() {
@@ -133,6 +126,7 @@ protected String getComponentID() {
     /**
      * Used for determining whether the fileID Argument is required for the concrete operation.
      * Must be specified by in the subclass.
+     *
      * @return Indicates whether the -f
      */
     protected abstract boolean isFileIDArgumentRequired();
@@ -148,13 +142,12 @@ protected void createOptionsForCmdArgumentHandler() {
         collectionOption.setRequired(Constants.ARGUMENT_IS_REQUIRED);
         cmdHandler.addOption(collectionOption);
 
-        Option fileIDOption = new Option(Constants.FILE_ID_ARG, Constants.HAS_ARGUMENT,
-                "The id for the file to perform the operation on.");
+        Option fileIDOption = new Option(Constants.FILE_ID_ARG, Constants.HAS_ARGUMENT, "The id for the file to perform the operation on.");
         fileIDOption.setRequired(isFileIDArgumentRequired());
         cmdHandler.addOption(fileIDOption);
 
-        Option pillarOption = new Option(Constants.PILLAR_ARG, Constants.HAS_ARGUMENT, "[OPTIONAL] The id of the "
-                + "pillar where the operation should be performed. If undefined the operation is performed on all pillars.");
+        Option pillarOption = new Option(Constants.PILLAR_ARG, Constants.HAS_ARGUMENT, "[OPTIONAL] The id of the " +
+                "pillar where the operation should be performed. If undefined the operation is performed on all pillars.");
         pillarOption.setRequired(Constants.ARGUMENT_IS_NOT_REQUIRED);
         cmdHandler.addOption(pillarOption);
     }
@@ -163,23 +156,23 @@ protected void createOptionsForCmdArgumentHandler() {
      * @throws IllegalArgumentException One of the arguments wasn't valid.
      */
     protected void validateArguments() {
-        if(cmdHandler.hasOption(Constants.FILE_ID_ARG)) {
+        if (cmdHandler.hasOption(Constants.FILE_ID_ARG)) {
             fileIDValidator.checkFileID(cmdHandler.getOptionValue(Constants.FILE_ID_ARG));
         }
-        if(cmdHandler.hasOption(Constants.COLLECTION_ID_ARG)) {
+        if (cmdHandler.hasOption(Constants.COLLECTION_ID_ARG)) {
             List<String> collections = SettingsUtils.getAllCollectionsIDs();
             String collectionArgument = cmdHandler.getOptionValue(Constants.COLLECTION_ID_ARG);
             if (!collections.contains(collectionArgument)) {
-                throw new IllegalArgumentException(collectionArgument + " is not a valid collection." +
-                        "\nThe following collections are defined: " + collections);
+                throw new IllegalArgumentException(
+                        collectionArgument + " is not a valid collection." + "\nThe following collections are defined: " + collections);
             }
         }
-        if(cmdHandler.hasOption(Constants.PILLAR_ARG)) {
+        if (cmdHandler.hasOption(Constants.PILLAR_ARG)) {
             String pillarArgument = cmdHandler.getOptionValue(Constants.PILLAR_ARG);
             List<String> pillarsInCollection = SettingsUtils.getPillarIDsForCollection(getCollectionID());
             if (!pillarsInCollection.contains(pillarArgument)) {
-                throw new IllegalArgumentException(pillarArgument + " is not a valid pillar for collection " +
-                        getCollectionID() + "\nThe collection contains the following pillars: " + pillarsInCollection);
+                throw new IllegalArgumentException(pillarArgument + " is not a valid pillar for collection " + getCollectionID() +
+                        "\nThe collection contains the following pillars: " + pillarsInCollection);
             }
         }
     }
@@ -189,7 +182,7 @@ protected void validateArguments() {
      * otherwise all file ids will be requested.
      */
     protected String getFileIDs() {
-        if(cmdHandler.hasOption(Constants.FILE_ID_ARG)) {
+        if (cmdHandler.hasOption(Constants.FILE_ID_ARG)) {
             return cmdHandler.getOptionValue(Constants.FILE_ID_ARG);
         } else {
             return null;
@@ -206,11 +199,12 @@ protected String getCollectionID() {
     /**
      * Extract the pillar ids. If a specific pillar is given as argument, then it will be returned, but if no such
      * argument has been given, then the list of all pillar ids are given.
+     *
      * @return The list of pillars to request for the file ids.
      */
     protected List<String> getPillarIDs() {
-        if(cmdHandler.hasOption(Constants.PILLAR_ARG)) {
-            return Arrays.asList(cmdHandler.getOptionValue(Constants.PILLAR_ARG));
+        if (cmdHandler.hasOption(Constants.PILLAR_ARG)) {
+            return List.of(cmdHandler.getOptionValue(Constants.PILLAR_ARG));
         } else {
             return SettingsUtils.getPillarIDsForCollection(getCollectionID());
         }
@@ -220,8 +214,8 @@ protected List<String> getPillarIDs() {
      * @return The timeout to use for performing the full operation.
      */
     protected long getTimeout() {
-        return settings.getRepositorySettings().getClientSettings().getIdentificationTimeout().longValue()
-                + settings.getRepositorySettings().getClientSettings().getOperationTimeout().longValue();
+        return settings.getRepositorySettings().getClientSettings().getIdentificationTimeout().longValue() +
+                settings.getRepositorySettings().getClientSettings().getOperationTimeout().longValue();
     }
 
     /**
@@ -235,7 +229,7 @@ protected ChecksumSpecTYPE getRequestChecksumSpecOrDefault() {
      * @return The requested checksum spec, or null.
      */
     protected ChecksumSpecTYPE getRequestChecksumSpecOrNull() {
-        if(!cmdHandler.hasOption(Constants.REQUEST_CHECKSUM_TYPE_ARG)) {
+        if (!cmdHandler.hasOption(Constants.REQUEST_CHECKSUM_TYPE_ARG)) {
             return null;
         }
 
@@ -246,22 +240,22 @@ protected ChecksumSpecTYPE getRequestChecksumSpecOrNull() {
      * Create the ChecksumSpecTYPE based on the cmd-line arguments.
      * Do not use directly. Use either 'getRequestChecksumSpecOrNull' or 'getRequestChecksumSpecOrDefault' to handle
      * the case, when no request arguments have been defined.
+     *
      * @return The requested checksum spec.
      */
     private ChecksumSpecTYPE getRequestChecksumSpec() {
         ChecksumSpecTYPE res = new ChecksumSpecTYPE();
         res.setChecksumType(ChecksumExtractionUtils.extractChecksumType(cmdHandler, settings, output));
 
-        if(cmdHandler.hasOption(Constants.REQUEST_CHECKSUM_SALT_ARG)) {
-            res.setChecksumSalt(Base16Utils.encodeBase16(cmdHandler.getOptionValue(
-                    Constants.REQUEST_CHECKSUM_SALT_ARG)));
+        if (cmdHandler.hasOption(Constants.REQUEST_CHECKSUM_SALT_ARG)) {
+            res.setChecksumSalt(Base16Utils.encodeBase16(cmdHandler.getOptionValue(Constants.REQUEST_CHECKSUM_SALT_ARG)));
         }
 
         try {
             ChecksumUtils.verifyAlgorithm(res);
         } catch (NoSuchAlgorithmException e) {
             output.error("Invalid checksum algorithm: " + e.getMessage());
-            throw new IllegalStateException("Invalid checksumspec for '" + res + "'", e);
+            throw new IllegalStateException("Invalid checksumSpec for '" + res + "'", e);
         }
 
         return res;
@@ -269,19 +263,19 @@ private ChecksumSpecTYPE getRequestChecksumSpec() {
 
     /**
      * Finds the file from the arguments.
+     *
      * @return The requested file, or null if no file argument was given.
      */
     protected File findTheFile() {
-        if(!cmdHandler.hasOption(Constants.FILE_ARG)) {
+        if (!cmdHandler.hasOption(Constants.FILE_ARG)) {
             output.warn("No file argument was given, so no file can be found.");
             return null;
         }
         String filePath = cmdHandler.getOptionValue(Constants.FILE_ARG);
 
         File file = new File(filePath);
-        if(!file.isFile()) {
-            throw new IllegalArgumentException("The file '" + filePath + "' is invalid. It does not exists or it "
-                    + "is a directory.");
+        if (!file.isFile()) {
+            throw new IllegalArgumentException("The file '" + filePath + "' is invalid. It does not exists or it " + "is a directory.");
         }
 
         return file;
@@ -289,10 +283,11 @@ protected File findTheFile() {
 
     /**
      * Creates the data structure for encapsulating the validation checksums for validation on the pillars.
+     *
      * @return The ChecksumDataForFileTYPE for the pillars to validate the DeleteFile or ReplaceFile operations.
      */
     protected ChecksumDataForFileTYPE getChecksumDataForDeleteValidation() {
-        if(!cmdHandler.hasOption(Constants.CHECKSUM_ARG)) {
+        if (!cmdHandler.hasOption(Constants.CHECKSUM_ARG)) {
             return null;
         }
 
@@ -305,7 +300,8 @@ protected ChecksumDataForFileTYPE getChecksumDataForDeleteValidation() {
     }
 
     /**
-     * Removes the file at the webserver after the operation has finished..
+     * Removes the file at the webserver after the operation has finished.
+     *
      * @param url The URL where the file should be removed from.
      */
     protected void deleteFileAfterwards(URL url) {
@@ -322,10 +318,11 @@ protected void deleteFileAfterwards(URL url) {
      * Retrieves the URL for the PutFile operation.
      * Either uploads the actual file to a webserver, or takes the URL argument.
      * Requires either the File argument or the URL argument.
+     *
      * @return The URL for the file.
      */
     protected URL getURLOrUploadFile() {
-        if(cmdHandler.hasOption(Constants.FILE_ARG)) {
+        if (cmdHandler.hasOption(Constants.FILE_ARG)) {
             File f = findTheFile();
             FileExchange fileexchange = ProtocolComponentFactory.getInstance().getFileExchange(settings);
             return fileexchange.putFile(f);
@@ -333,8 +330,8 @@ protected URL getURLOrUploadFile() {
             try {
                 return new URL(cmdHandler.getOptionValue(Constants.URL_ARG));
             } catch (MalformedURLException e) {
-                throw new IllegalArgumentException("The URL argument is either empty or not a valid URL: " 
-                        + cmdHandler.getOptionValue(Constants.URL_ARG), e);
+                throw new IllegalArgumentException(
+                        "The URL argument is either empty or not a valid URL: " + cmdHandler.getOptionValue(Constants.URL_ARG), e);
             }
         }
     }
@@ -343,7 +340,7 @@ protected URL getURLOrUploadFile() {
      * @return The size of the actual file, or 0 if no file argument is given.
      */
     protected long getSizeOfFileOrZero() {
-        if(cmdHandler.hasOption(Constants.FILE_ARG)) {
+        if (cmdHandler.hasOption(Constants.FILE_ARG)) {
             return findTheFile().length();
         } else {
             return 0L;
@@ -351,8 +348,9 @@ protected long getSizeOfFileOrZero() {
     }
 
     /**
-     * Creates the data structure for encapsulating the validation checksums for validation of the PutFile 
+     * Creates the data structure for encapsulating the validation checksums for validation of the PutFile
      * or ReplaceFile operations.
+     *
      * @param file The file to have the checksum calculated.
      * @return The ChecksumDataForFileTYPE for the pillars to validate the operations.
      */
@@ -369,14 +367,15 @@ protected ChecksumDataForFileTYPE getValidationChecksumDataForFile(File file) {
     }
 
     /**
-     * Creates the data structure for encapsulating the validation checksums for validation of the PutFile 
+     * Creates the data structure for encapsulating the validation checksums for validation of the PutFile
      * or ReplaceFile operations.
-     * @param arg The name of the argument to retrieve the checksum from 
-     * (must likely Constants.CHECKSUM_ARG or Constants.REPLACE_CHECKSUM_ARG)
+     *
+     * @param arg The name of the argument to retrieve the checksum from
+     *            (must likely Constants.CHECKSUM_ARG or Constants.REPLACE_CHECKSUM_ARG)
      * @return The ChecksumDataForFileTYPE for the pillars to validate the operations.
      */
     protected ChecksumDataForFileTYPE getValidationChecksumDataFromArgument(String arg) {
-        if(!cmdHandler.hasOption(arg)) {
+        if (!cmdHandler.hasOption(arg)) {
             return null;
         }
         ChecksumSpecTYPE csSpec = ChecksumUtils.getDefault(settings);
@@ -391,10 +390,11 @@ protected ChecksumDataForFileTYPE getValidationChecksumDataFromArgument(String a
 
     /**
      * Extracts the id of the file to be put.
-     * @return The either the value of the file id argument, or no such option, then the name of the file.
+     *
+     * @return Returns either the value of the file ID argument, or no such option, then the name of the file.
      */
     protected String retrieveFileID() {
-        if(cmdHandler.hasOption(Constants.FILE_ID_ARG)) {
+        if (cmdHandler.hasOption(Constants.FILE_ID_ARG)) {
             return cmdHandler.getOptionValue(Constants.FILE_ID_ARG);
         } else {
             return findTheFile().getName();
@@ -403,11 +403,12 @@ protected String retrieveFileID() {
 
     /**
      * Closes the connections, e.g. to the message-bus.
+     *
      * @throws JMSException If the message-bus cannot be closed.
      */
     public void shutdown() throws JMSException {
         MessageBus bus = MessageBusManager.getMessageBus();
-        if(bus != null) {
+        if (bus != null) {
             bus.close();
         }
     }
diff --git a/bitrepository-client/src/main/java/org/bitrepository/commandline/Constants.java b/bitrepository-client/src/main/java/org/bitrepository/commandline/Constants.java
index 55fe724fb..5b72d3f55 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/commandline/Constants.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/commandline/Constants.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -30,49 +30,70 @@ public class Constants {
      */
     private Constants() {}
 
-    /** If an argument is required.*/
     public static final Boolean ARGUMENT_IS_REQUIRED = true;
-    /** If an argument is not required.*/
     public static final Boolean ARGUMENT_IS_NOT_REQUIRED = false;
-    /** If a given option has an argument.*/
     public static final Boolean HAS_ARGUMENT = true;
-    /** If a given option dies not have an argument.*/
     public static final Boolean NO_ARGUMENT = false;
-    /** For not allowing undefined arguments when parsing of arguments.*/
     public static final Boolean NOT_ALLOWING_UNDEFINED_ARGUMENTS = false;
-
-    /** The path to the settings.*/ 
+    /**
+     * The path to the settings.
+     */
     public static final String SETTINGS_ARG = "s";
-    /** The path to the private key.*/
+    /**
+     * The path to the private key.
+     */
     public static final String PRIVATE_KEY_ARG = "k";
-    /** */
+    /**
+     *
+     */
     public static final String VERBOSITY_ARG = "v";
 
-    /** The collectionID argument */
+    /**
+     * The collectionID argument
+     */
     public static final String COLLECTION_ID_ARG = "c";
-    /** The file argument.*/
+    /**
+     * The file argument.
+     */
     public static final String FILE_ARG = "f";
-    /** The argument for the id of the file.*/
+    /**
+     * The argument for the id of the file.
+     */
     public static final String FILE_ID_ARG = "i";
-    /** The pillar argument.*/
+    /**
+     * The pillar argument.
+     */
     public static final String PILLAR_ARG = "p";
-    /** The checksum of the file.*/
+    /**
+     * The checksum of the file.
+     */
     public static final String CHECKSUM_ARG = "C";
-    /** The checksum of the file to replace.*/
+    /**
+     * The checksum of the file to replace.
+     */
     public static final String REPLACE_CHECKSUM_ARG = "r";
-    /** The argument for the type of checksum to request.*/
+    /**
+     * The argument for the type of checksum to request.
+     */
     public static final String REQUEST_CHECKSUM_TYPE_ARG = "R";
-    /** The argument for the salt of the checksum to request.*/
+    /**
+     * The argument for the salt of the checksum to request.
+     */
     public static final String REQUEST_CHECKSUM_SALT_ARG = "S";
-    /** The argument for deleting files afterwards.*/
+    /**
+     * The argument for deleting files afterwards.
+     */
     public static final String DELETE_FILE_ARG = "d";
-    /** The argument for the URL of a file.*/
+    /**
+     * The argument for the URL of a file.
+     */
     public static final String URL_ARG = "u";
 
-    /** The argument for the location of the results.*/
+    /**
+     * The argument for the location of the results.
+     */
     public static final String LOCATION = "l";
 
-
     public static final int EXIT_SUCCESS = 0;
     public static final int EXIT_ARGUMENT_FAILURE = 1;
     public static final int EXIT_OPERATION_FAILURE = -1;
diff --git a/bitrepository-client/src/main/java/org/bitrepository/commandline/DeleteFileCmd.java b/bitrepository-client/src/main/java/org/bitrepository/commandline/DeleteFileCmd.java
index de074b45d..d7f5929c5 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/commandline/DeleteFileCmd.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/commandline/DeleteFileCmd.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -35,7 +35,9 @@
  * Deleting a file from the collection.
  */
 public class DeleteFileCmd extends CommandLineClient {
-    /** The client for performing the DeleteFile operation.*/
+    /**
+     * The client for performing the DeleteFile operation.
+     */
     private final DeleteFileClient client;
 
     /**
@@ -56,7 +58,7 @@ public static void main(String[] args) {
     /**
      * @param args The command line arguments for defining the operation.
      */
-    protected DeleteFileCmd(String ... args) {
+    protected DeleteFileCmd(String... args) {
         super(args);
         client = ModifyComponentFactory.getInstance().retrieveDeleteFileClient(settings, securityManager,
                 getComponentID());
@@ -88,7 +90,7 @@ protected void createOptionsForCmdArgumentHandler() {
 
     protected void validateArguments() {
         super.validateArguments();
-        if(!cmdHandler.hasOption(Constants.PILLAR_ARG)) {
+        if (!cmdHandler.hasOption(Constants.PILLAR_ARG)) {
             throw new IllegalArgumentException("The pillar argument -p must defined for the delete operation, " +
                     "only single pillar deletes are allowed");
         }
@@ -108,7 +110,7 @@ public void performOperation() {
         output.completeEvent("Results of the DeleteFile operation for the file '"
                 + cmdHandler.getOptionValue(Constants.FILE_ID_ARG) + "'"
                 + ": ", finalEvent);
-        if(finalEvent.getEventType() == OperationEventType.COMPLETE) {
+        if (finalEvent.getEventType() == OperationEventType.COMPLETE) {
             System.exit(Constants.EXIT_SUCCESS);
         } else {
             System.exit(Constants.EXIT_OPERATION_FAILURE);
@@ -117,6 +119,7 @@ public void performOperation() {
 
     /**
      * Initiates the operation and waits for the results.
+     *
      * @return The final event for the results of the operation. Either 'FAILURE' or 'COMPLETE'.
      */
     private OperationEvent deleteTheFile() {
diff --git a/bitrepository-client/src/main/java/org/bitrepository/commandline/GetChecksumsCmd.java b/bitrepository-client/src/main/java/org/bitrepository/commandline/GetChecksumsCmd.java
index cfbb05564..c9986d9f3 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/commandline/GetChecksumsCmd.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/commandline/GetChecksumsCmd.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -31,11 +31,7 @@
 import org.bitrepository.commandline.outputformatter.GetChecksumsOutputFormatter;
 import org.bitrepository.common.utils.SettingsUtils;
 
-/**
- * Perform the GetChecksums operation.
- */
 public class GetChecksumsCmd extends CommandLineClient {
-    /** The client for performing the GetChecksums operation.*/
     private final PagingGetChecksumsClient pagingClient;
 
     /**
@@ -56,13 +52,13 @@ public static void main(String[] args) {
     /**
      * @param args The command line arguments for defining the operation.
      */
-    protected GetChecksumsCmd(String ... args) {
+    protected GetChecksumsCmd(String... args) {
         super(args);
-        GetChecksumsClient client = AccessComponentFactory.getInstance().createGetChecksumsClient(settings, 
+        GetChecksumsClient client = AccessComponentFactory.getInstance().createGetChecksumsClient(settings,
                 securityManager, getComponentID());
         GetChecksumsOutputFormatter outputFormatter = retrieveOutputFormatter();
         int pageSize = SettingsUtils.getMaxClientPageSize();
-        pagingClient = new PagingGetChecksumsClient(client, getTimeout(), pageSize, outputFormatter, output); 
+        pagingClient = new PagingGetChecksumsClient(client, getTimeout(), pageSize, outputFormatter, output);
     }
 
     @Override
@@ -76,13 +72,13 @@ protected boolean isFileIDArgumentRequired() {
     protected void createOptionsForCmdArgumentHandler() {
         super.createOptionsForCmdArgumentHandler();
 
-        Option checksumTypeOption = new Option(Constants.REQUEST_CHECKSUM_TYPE_ARG, Constants.HAS_ARGUMENT, 
+        Option checksumTypeOption = new Option(Constants.REQUEST_CHECKSUM_TYPE_ARG, Constants.HAS_ARGUMENT,
                 "[OPTIONAL] The algorithm of checksum to request in the response from the pillars. "
                         + "If no such argument is given, then the default from settings is retrieved.");
         checksumTypeOption.setRequired(Constants.ARGUMENT_IS_NOT_REQUIRED);
         cmdHandler.addOption(checksumTypeOption);
 
-        Option checksumSaltOption = new Option(Constants.REQUEST_CHECKSUM_SALT_ARG, Constants.HAS_ARGUMENT, 
+        Option checksumSaltOption = new Option(Constants.REQUEST_CHECKSUM_SALT_ARG, Constants.HAS_ARGUMENT,
                 "[OPTIONAL] The salt of checksum to request in the response. Requires the ChecksumType argument.");
         checksumSaltOption.setRequired(Constants.ARGUMENT_IS_NOT_REQUIRED);
         cmdHandler.addOption(checksumSaltOption);
@@ -95,9 +91,9 @@ protected void createOptionsForCmdArgumentHandler() {
     protected void performOperation() {
         ChecksumSpecTYPE spec = getRequestChecksumSpecOrDefault();
         output.startupInfo("Performing the GetChecksums operation.");
-        Boolean success = pagingClient.getChecksums(getCollectionID(), getFileIDs(), 
+        boolean success = pagingClient.getChecksums(getCollectionID(), getFileIDs(),
                 getPillarIDs(), spec);
-        if(success) {
+        if (success) {
             System.exit(Constants.EXIT_SUCCESS);
         } else {
             System.exit(Constants.EXIT_OPERATION_FAILURE);
@@ -105,11 +101,12 @@ protected void performOperation() {
     }
 
     /**
-     * Retrieves the given output formatter depending on whether or not it requests a given file or all files.
+     * Retrieves the given output formatter depending on whether it requests a given file or all files.
+     *
      * @return The output formatter.
      */
     private GetChecksumsOutputFormatter retrieveOutputFormatter() {
-        if(cmdHandler.hasOption(Constants.FILE_ID_ARG)) {
+        if (cmdHandler.hasOption(Constants.FILE_ID_ARG)) {
             return new GetChecksumDistributionFormatter(output);
         } else {
             return new GetChecksumsInfoFormatter(output);
diff --git a/bitrepository-client/src/main/java/org/bitrepository/commandline/GetFileCmd.java b/bitrepository-client/src/main/java/org/bitrepository/commandline/GetFileCmd.java
index 49a5d5d99..b5c92fe55 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/commandline/GetFileCmd.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/commandline/GetFileCmd.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -30,7 +30,6 @@
 import org.bitrepository.commandline.eventhandler.GetFileEventHandler;
 import org.bitrepository.protocol.FileExchange;
 import org.bitrepository.protocol.ProtocolComponentFactory;
-import org.bitrepository.protocol.http.HttpFileExchange;
 
 import java.io.File;
 import java.net.MalformedURLException;
@@ -40,9 +39,7 @@
  * Perform the GetFile operation.
  */
 public class GetFileCmd extends CommandLineClient {
-    /** The client for performing the GetFile operation.*/
     private final GetFileClient client;
-    /** The URL for where the file from the GetFile*/
     private URL fileUrl = null;
 
     /**
@@ -63,7 +60,7 @@ public static void main(String[] args) {
     /**
      * @param args The command line arguments for defining the operation.
      */
-    protected GetFileCmd(String ... args) {
+    protected GetFileCmd(String... args) {
         super(args);
         client = AccessComponentFactory.getInstance().createGetFileClient(settings, securityManager,
                 getComponentID());
@@ -94,7 +91,7 @@ public void performOperation() {
         output.debug("Results of the GetFile operation for the file '"
                 + cmdHandler.getOptionValue(Constants.FILE_ID_ARG) + "'"
                 + ": " + finalEvent);
-        if(finalEvent.getEventType() == OperationEventType.COMPLETE) {
+        if (finalEvent.getEventType() == OperationEventType.COMPLETE) {
             downloadFile();
             output.resultLine(fileArg + " retrieved");
             System.exit(Constants.EXIT_SUCCESS);
@@ -105,6 +102,7 @@ public void performOperation() {
 
     /**
      * Initiates the operation and waits for the results.
+     *
      * @return The final event for the results of the operation. Either 'FAILURE' or 'COMPLETE'.
      */
     private OperationEvent performConversation() {
@@ -114,7 +112,7 @@ private OperationEvent performConversation() {
         CompleteEventAwaiter eventHandler = new GetFileEventHandler(settings, output);
         output.debug("Initiating the GetFile conversation.");
 
-        if(cmdHandler.hasOption(Constants.PILLAR_ARG)) {
+        if (cmdHandler.hasOption(Constants.PILLAR_ARG)) {
             String pillarID = cmdHandler.getOptionValue(Constants.PILLAR_ARG);
             client.getFileFromSpecificPillar(getCollectionID(), fileID, null, fileUrl, pillarID, eventHandler, null);
         } else {
@@ -130,9 +128,9 @@ private OperationEvent performConversation() {
     private void downloadFile() {
         output.debug("Downloading the file.");
         File outputFile;
-        if(cmdHandler.hasOption(Constants.LOCATION)) {
+        if (cmdHandler.hasOption(Constants.LOCATION)) {
             File location = new File(cmdHandler.getOptionValue(Constants.LOCATION));
-            if(location.isDirectory()) {
+            if (location.isDirectory()) {
                 outputFile = new File(location, cmdHandler.getOptionValue(Constants.FILE_ID_ARG));
             } else {
                 outputFile = location;
@@ -146,6 +144,7 @@ private void downloadFile() {
 
     /**
      * Extracts the URL for where the file should be delivered from the GetFile operation.
+     *
      * @param fileID The id of the file.
      * @return The URL where the file should be located.
      */
diff --git a/bitrepository-client/src/main/java/org/bitrepository/commandline/GetFileIDsCmd.java b/bitrepository-client/src/main/java/org/bitrepository/commandline/GetFileIDsCmd.java
index ef95fd9a7..bb9b447c9 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/commandline/GetFileIDsCmd.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/commandline/GetFileIDsCmd.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -32,7 +32,6 @@
  * Perform the GetFileIDs operation.
  */
 public class GetFileIDsCmd extends CommandLineClient {
-    /** The client for performing the actual operation.*/
     private final PagingGetFileIDsClient pagingClient;
 
     /**
@@ -53,17 +52,17 @@ public static void main(String[] args) {
     /**
      * @param args The command line arguments for defining the operation.
      */
-    protected GetFileIDsCmd(String ... args) {
+    protected GetFileIDsCmd(String... args) {
         super(args);
         output.debug("Instantiation GetFileIDClient.");
-        GetFileIDsClient client = AccessComponentFactory.getInstance().createGetFileIDsClient(settings, 
+        GetFileIDsClient client = AccessComponentFactory.getInstance().createGetFileIDsClient(settings,
                 securityManager, getComponentID());
         output.debug("Instantiation GetFileID outputFormatter.");
         GetFileIDsOutputFormatter outputFormatter = new GetFileIDsInfoFormatter(output);
 
         output.debug("Instantiation GetFileID paging client.");
         int pageSize = SettingsUtils.getMaxClientPageSize();
-        pagingClient = new PagingGetFileIDsClient(client, getTimeout(), pageSize, outputFormatter, output); 
+        pagingClient = new PagingGetFileIDsClient(client, getTimeout(), pageSize, outputFormatter, output);
     }
 
     @Override
@@ -76,8 +75,8 @@ protected boolean isFileIDArgumentRequired() {
      */
     public void performOperation() {
         output.startupInfo("Performing the GetFileIDs operation.");
-        Boolean success = pagingClient.getFileIDs(getCollectionID(), getFileIDs(), getPillarIDs());
-        if(success) {
+        boolean success = pagingClient.getFileIDs(getCollectionID(), getFileIDs(), getPillarIDs());
+        if (success) {
             System.exit(Constants.EXIT_SUCCESS);
         } else {
             System.exit(Constants.EXIT_OPERATION_FAILURE);
diff --git a/bitrepository-client/src/main/java/org/bitrepository/commandline/PutFileCmd.java b/bitrepository-client/src/main/java/org/bitrepository/commandline/PutFileCmd.java
index 19939bc9d..60353c0b3 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/commandline/PutFileCmd.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/commandline/PutFileCmd.java
@@ -33,14 +33,9 @@
 
 import java.net.URL;
 
-/**
- * Putting a file to the collection.
- */
-public class PutFileCmd extends CommandLineClient {
+import static org.bitrepository.commandline.Constants.ARGUMENT_IS_NOT_REQUIRED;
 
-    /**
-     * The client for performing the PutFile operation.
-     */
+public class PutFileCmd extends CommandLineClient {
     private final PutFileClient client;
 
     /**
@@ -59,14 +54,14 @@ public static void main(String[] args) {
     }
 
     /**
-     * @param args The arguments:
-     *             k = Location of file with private security key.
-     *             s = Location of folder with setting files.
-     *             c = ID of the Collection
-     *             f = The actual file to put (Either this or the URL).
-     *             u = The URL for the file (Either this or the actual file, though this requires both file id and checksum).
-     *             i = The id of the file to put.
-     *             C = The checksum of the file.
+     * @param args Valid arguments are: <p/>
+     *             k = Location of file with private security key. <br/>
+     *             s = Location of folder with setting files. <br/>
+     *             c = ID of the Collection. <br/>
+     *             f = The actual file to put (Either this or the URL). <br/>
+     *             u = The URL for the file (Either this or the actual file, though this requires both file id and checksum). <br/>
+     *             i = The id of the file to put. <br/>
+     *             C = The checksum of the file. <br/>
      */
     protected PutFileCmd(String... args) {
         super(args);
@@ -79,7 +74,7 @@ protected boolean isFileIDArgumentRequired() {
     }
 
     /**
-     * Perform the PutFile operation.
+     * Performs the PutFile operation.
      */
     @Override
     public void performOperation() {
@@ -98,38 +93,38 @@ protected void createOptionsForCmdArgumentHandler() {
         super.createOptionsForCmdArgumentHandler();
 
         Option fileOption = new Option(Constants.FILE_ARG, Constants.HAS_ARGUMENT,
-                "The path to the file, which needs to be  uploaded. Is required, unless a URL is given.");
-        fileOption.setRequired(Constants.ARGUMENT_IS_NOT_REQUIRED);
+                "The path to the file to be uploaded. Is required, unless a URL is given.");
+        fileOption.setRequired(ARGUMENT_IS_NOT_REQUIRED);
         cmdHandler.addOption(fileOption);
 
         Option urlOption = new Option(Constants.URL_ARG, Constants.HAS_ARGUMENT,
-                "The URL for the file to be put. Is required, unless the actual file is given.");
-        urlOption.setRequired(Constants.ARGUMENT_IS_NOT_REQUIRED);
+                "The URL for the file to be uploaded. Is required, unless a local file is given.");
+        urlOption.setRequired(ARGUMENT_IS_NOT_REQUIRED);
         cmdHandler.addOption(urlOption);
 
         Option checksumOption = new Option(Constants.CHECKSUM_ARG, Constants.HAS_ARGUMENT,
-                "The checksum for the file to be retrieved. Required if using an URL.");
-        checksumOption.setRequired(Constants.ARGUMENT_IS_NOT_REQUIRED);
+                "The checksum for the file to be retrieved. Is required if using a URL.");
+        checksumOption.setRequired(ARGUMENT_IS_NOT_REQUIRED);
         cmdHandler.addOption(checksumOption);
 
         Option checksumTypeOption = new Option(Constants.REQUEST_CHECKSUM_TYPE_ARG, Constants.HAS_ARGUMENT,
-                "[OPTIONAL] The algorithm of checksum to request in the response from the pillars.");
-        checksumTypeOption.setRequired(Constants.ARGUMENT_IS_NOT_REQUIRED);
+                "[OPTIONAL] Used to request a specific checksum algorithm in the response from the pillars.");
+        checksumTypeOption.setRequired(ARGUMENT_IS_NOT_REQUIRED);
         cmdHandler.addOption(checksumTypeOption);
         Option checksumSaltOption = new Option(Constants.REQUEST_CHECKSUM_SALT_ARG, Constants.HAS_ARGUMENT,
-                "[OPTIONAL] The salt of checksum to request in the response. Requires the ChecksumType argument.");
-        checksumSaltOption.setRequired(Constants.ARGUMENT_IS_NOT_REQUIRED);
+                "[OPTIONAL] Used to request a salted checksum in the response. Requires the ChecksumType argument.");
+        checksumSaltOption.setRequired(ARGUMENT_IS_NOT_REQUIRED);
         cmdHandler.addOption(checksumSaltOption);
 
         Option deleteOption = new Option(Constants.DELETE_FILE_ARG, Constants.NO_ARGUMENT,
-                "If this argument is present, then the file will be removed from the server, " + "when the operation is complete.");
-        deleteOption.setRequired(Constants.ARGUMENT_IS_NOT_REQUIRED);
+                "If this argument is present, then the file will be removed from the server, when the chosen operation is complete.");
+        deleteOption.setRequired(ARGUMENT_IS_NOT_REQUIRED);
         cmdHandler.addOption(deleteOption);
     }
 
     /**
-     * Run the default validation, and validates that only file or URL is given.
-     * Also, if it is an URL is given, then it must also be given the checksum and the file id.
+     * Run the default validation, and validates that either only file or URL is given.
+     * Also, if it is a URL that is given, then it must also be given the checksum and the file id.
      */
     @Override
     protected void validateArguments() {
@@ -145,7 +140,7 @@ protected void validateArguments() {
             throw new IllegalArgumentException("The URL argument requires also the checksum argument (-c).");
         }
         if (cmdHandler.hasOption(Constants.URL_ARG) && !cmdHandler.hasOption(Constants.FILE_ID_ARG)) {
-            throw new IllegalArgumentException("The URL argument requires also the argument for the ID of the " + "file (-i).");
+            throw new IllegalArgumentException("The URL argument requires also the argument for the ID of the file (-i).");
         }
     }
 
@@ -177,13 +172,13 @@ private OperationEvent putTheFile() {
         return finalEvent;
     }
 
-
     /**
-     * Retrieves the Checksum for the pillars to validate, either taken from the actual file,
-     * or from the checksum argument.
-     * It will be in the default checksum spec type from settings.
+     * Retrieves the Checksum of the file, used by the pillars to validate.
+     * This checksum is either taken from the actual file, or from the checksum argument.
+     * <p/>
+     * The checksum will be of the default checksum spec-type, which is defined in the settings.
      *
-     * @return The checksum validation type.
+     * @return The spec-type of the checksum as {@link ChecksumDataForFileTYPE}.
      */
     protected ChecksumDataForFileTYPE getValidationChecksum() {
         if (cmdHandler.hasOption(Constants.FILE_ARG)) {
@@ -194,7 +189,7 @@ protected ChecksumDataForFileTYPE getValidationChecksum() {
     }
 
     /**
-     * @return The filename for the file to upload.
+     * @return The filename (FileID) for the file to upload.
      */
     private String getFileIDForMessage() {
         if (cmdHandler.hasOption(Constants.URL_ARG)) {
diff --git a/bitrepository-client/src/main/java/org/bitrepository/commandline/ReplaceFileCmd.java b/bitrepository-client/src/main/java/org/bitrepository/commandline/ReplaceFileCmd.java
index bbe6cf5e1..f14cd08bd 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/commandline/ReplaceFileCmd.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/commandline/ReplaceFileCmd.java
@@ -5,24 +5,22 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.commandline;
 
-import java.net.URL;
-
 import org.apache.commons.cli.Option;
 import org.bitrepository.bitrepositoryelements.ChecksumDataForFileTYPE;
 import org.bitrepository.bitrepositoryelements.ChecksumSpecTYPE;
@@ -33,12 +31,25 @@
 import org.bitrepository.modify.ModifyComponentFactory;
 import org.bitrepository.modify.replacefile.ReplaceFileClient;
 
-/**
- * Replace a file from the collection.
- * 
- */
+import java.net.URL;
+
+import static org.bitrepository.commandline.Constants.ARGUMENT_IS_NOT_REQUIRED;
+import static org.bitrepository.commandline.Constants.CHECKSUM_ARG;
+import static org.bitrepository.commandline.Constants.DELETE_FILE_ARG;
+import static org.bitrepository.commandline.Constants.EXIT_ARGUMENT_FAILURE;
+import static org.bitrepository.commandline.Constants.EXIT_OPERATION_FAILURE;
+import static org.bitrepository.commandline.Constants.EXIT_SUCCESS;
+import static org.bitrepository.commandline.Constants.FILE_ARG;
+import static org.bitrepository.commandline.Constants.FILE_ID_ARG;
+import static org.bitrepository.commandline.Constants.HAS_ARGUMENT;
+import static org.bitrepository.commandline.Constants.NO_ARGUMENT;
+import static org.bitrepository.commandline.Constants.PILLAR_ARG;
+import static org.bitrepository.commandline.Constants.REPLACE_CHECKSUM_ARG;
+import static org.bitrepository.commandline.Constants.REQUEST_CHECKSUM_SALT_ARG;
+import static org.bitrepository.commandline.Constants.REQUEST_CHECKSUM_TYPE_ARG;
+import static org.bitrepository.commandline.Constants.URL_ARG;
+
 public class ReplaceFileCmd extends CommandLineClient {
-    /** The client for performing the ReplaceFile operation.*/
     private final ReplaceFileClient client;
 
     /**
@@ -49,20 +60,19 @@ public static void main(String[] args) {
             ReplaceFileCmd client = new ReplaceFileCmd(args);
             client.runCommand();
         } catch (IllegalArgumentException iae) {
-            System.exit(Constants.EXIT_ARGUMENT_FAILURE);
+            System.exit(EXIT_ARGUMENT_FAILURE);
         } catch (Exception e) {
             e.printStackTrace();
-            System.exit(Constants.EXIT_OPERATION_FAILURE);
+            System.exit(EXIT_OPERATION_FAILURE);
         }
     }
 
     /**
      * @param args The command line arguments for defining the operation.
      */
-    protected ReplaceFileCmd(String ... args) {
+    protected ReplaceFileCmd(String... args) {
         super(args);
-        client = ModifyComponentFactory.getInstance().retrieveReplaceFileClient(settings, securityManager,
-                getComponentID());
+        client = ModifyComponentFactory.getInstance().retrieveReplaceFileClient(settings, securityManager, getComponentID());
     }
 
     @Override
@@ -74,74 +84,71 @@ protected boolean isFileIDArgumentRequired() {
     protected void createOptionsForCmdArgumentHandler() {
         super.createOptionsForCmdArgumentHandler();
 
-        Option checksumOption = new Option(Constants.CHECKSUM_ARG, Constants.HAS_ARGUMENT,
-                "[OPTIONAL] The checksum of the file to be replaced.");
-        checksumOption.setRequired(Constants.ARGUMENT_IS_NOT_REQUIRED);
+        Option checksumOption = new Option(CHECKSUM_ARG, HAS_ARGUMENT, "[OPTIONAL] The checksum of the file to be replaced.");
+        checksumOption.setRequired(ARGUMENT_IS_NOT_REQUIRED);
         cmdHandler.addOption(checksumOption);
-        Option fileOption = new Option(Constants.FILE_ARG, Constants.HAS_ARGUMENT,
+        Option fileOption = new Option(FILE_ARG, HAS_ARGUMENT,
                 "The path to the new file for the replacement. Required unless using the URL argument.");
-        fileOption.setRequired(Constants.ARGUMENT_IS_NOT_REQUIRED);
+        fileOption.setRequired(ARGUMENT_IS_NOT_REQUIRED);
         cmdHandler.addOption(fileOption);
-        Option urlOption = new Option(Constants.URL_ARG, Constants.HAS_ARGUMENT, 
-                "The URL for the file to be retreived. Is required, unless the actual file is given.");
-        urlOption.setRequired(Constants.ARGUMENT_IS_NOT_REQUIRED);
+        Option urlOption = new Option(URL_ARG, HAS_ARGUMENT,
+                "The URL for the file to be retrieved. Is required, unless the actual file is given.");
+        urlOption.setRequired(ARGUMENT_IS_NOT_REQUIRED);
         cmdHandler.addOption(urlOption);
-        Option replaceChecksumOption = new Option(Constants.REPLACE_CHECKSUM_ARG, Constants.HAS_ARGUMENT, 
+        Option replaceChecksumOption = new Option(REPLACE_CHECKSUM_ARG, HAS_ARGUMENT,
                 "The checksum for the file to replace with. Required when using the URL argument.");
-        replaceChecksumOption.setRequired(Constants.ARGUMENT_IS_NOT_REQUIRED);
+        replaceChecksumOption.setRequired(ARGUMENT_IS_NOT_REQUIRED);
         cmdHandler.addOption(replaceChecksumOption);
 
-        Option checksumTypeOption = new Option(Constants.REQUEST_CHECKSUM_TYPE_ARG, Constants.HAS_ARGUMENT,
+        Option checksumTypeOption = new Option(REQUEST_CHECKSUM_TYPE_ARG, HAS_ARGUMENT,
                 "[OPTIONAL] The algorithm of checksum to request in the response from the pillars.");
-        checksumTypeOption.setRequired(Constants.ARGUMENT_IS_NOT_REQUIRED);
+        checksumTypeOption.setRequired(ARGUMENT_IS_NOT_REQUIRED);
         cmdHandler.addOption(checksumTypeOption);
-        Option checksumSaltOption = new Option(Constants.REQUEST_CHECKSUM_SALT_ARG, Constants.HAS_ARGUMENT,
+        Option checksumSaltOption = new Option(REQUEST_CHECKSUM_SALT_ARG, HAS_ARGUMENT,
                 "[OPTIONAL] The salt of checksum to request in the response. Requires the ChecksumType argument.");
-        checksumSaltOption.setRequired(Constants.ARGUMENT_IS_NOT_REQUIRED);
+        checksumSaltOption.setRequired(ARGUMENT_IS_NOT_REQUIRED);
         cmdHandler.addOption(checksumSaltOption);
 
-        Option deleteOption = new Option(Constants.DELETE_FILE_ARG, Constants.NO_ARGUMENT, 
-                "If this argument is present, then the file will be removed from the server, "
-                        + "when the operation is complete.");
-        deleteOption.setRequired(Constants.ARGUMENT_IS_NOT_REQUIRED);
+        Option deleteOption = new Option(DELETE_FILE_ARG, NO_ARGUMENT,
+                "If this argument is present, then the file will be removed from the server, when the operation is complete.");
+        deleteOption.setRequired(ARGUMENT_IS_NOT_REQUIRED);
         cmdHandler.addOption(deleteOption);
     }
 
     /**
      * Run the default validation, and the following replace-file specific validations.
      * Requires the pillar argument, since the client only may replace at one pillar at the time.
-     * If settings require a checksum for "destructive requests" - like replace - then the checksum argument is 
+     * If settings require a checksum for "destructive requests" - like replace - then the checksum argument is
      * also required.
-     * 
-     * It must take either the actual file or an URL is given for the file to replace.
-     * Also, if it is an URL is given, then it must also be given the checksum and the file id.
+     * <p>
+     * It must take either the actual file or a URL is given for the file to replace.
+     * Also, if it is a URL is given, then it must also be given the checksum and the file id.
      */
     @Override
     protected void validateArguments() {
         super.validateArguments();
-        if(!cmdHandler.hasOption(Constants.PILLAR_ARG)) {
-            throw new IllegalArgumentException("The pillar argument (-p) must defined for the Replace operation, " +
-                    "only single pillar Replaces are allowed");
+        if (!cmdHandler.hasOption(PILLAR_ARG)) {
+            throw new IllegalArgumentException(
+                    "The pillar argument (-p) must defined for the Replace operation, " + "only single pillar Replaces are allowed");
         }
-        if (!cmdHandler.hasOption(Constants.CHECKSUM_ARG) &&
+        if (!cmdHandler.hasOption(CHECKSUM_ARG) &&
                 settings.getRepositorySettings().getProtocolSettings().isRequireChecksumForDestructiveRequests()) {
-            throw new IllegalArgumentException("Checksum argument (-C) are mandatory for Replace and replace "
-                    + "operations as defined in RepositorySettings.");
+            throw new IllegalArgumentException(
+                    "Checksum argument (-C) are mandatory for Replace and replace " + "operations as defined in RepositorySettings.");
         }
 
-        if(cmdHandler.hasOption(Constants.FILE_ARG) && cmdHandler.hasOption(Constants.URL_ARG)) {
+        if (cmdHandler.hasOption(FILE_ARG) && cmdHandler.hasOption(URL_ARG)) {
             throw new IllegalArgumentException("Cannot take both a file (-f) and an URL (-u) as argument.");
         }
-        if(!cmdHandler.hasOption(Constants.FILE_ARG) && !cmdHandler.hasOption(Constants.URL_ARG)) {
+        if (!cmdHandler.hasOption(FILE_ARG) && !cmdHandler.hasOption(URL_ARG)) {
             throw new IllegalArgumentException("Requires either the file argument (-f) or the URL argument (-u).");
         }
-        if(cmdHandler.hasOption(Constants.URL_ARG) && !cmdHandler.hasOption(Constants.REPLACE_CHECKSUM_ARG)) {
-            throw new IllegalArgumentException("The URL argument requires also the checksum argument for the file "
-                    + "to replace with (-r).");
+        if (cmdHandler.hasOption(URL_ARG) && !cmdHandler.hasOption(REPLACE_CHECKSUM_ARG)) {
+            throw new IllegalArgumentException(
+                    "The URL argument requires also the checksum argument for the file " + "to replace with (-r).");
         }
-        if(cmdHandler.hasOption(Constants.URL_ARG) && !cmdHandler.hasOption(Constants.FILE_ID_ARG)) {
-            throw new IllegalArgumentException("The URL argument requires also the argument for the ID of the "
-                    + "file (-i).");
+        if (cmdHandler.hasOption(URL_ARG) && !cmdHandler.hasOption(FILE_ID_ARG)) {
+            throw new IllegalArgumentException("The URL argument requires also the argument for the ID of the " + "file (-i).");
         }
     }
 
@@ -149,18 +156,18 @@ protected void validateArguments() {
     public void performOperation() {
         output.debug("Performing the ReplaceFile operation.");
         OperationEvent finalEvent = replaceTheFile();
-        output.completeEvent("Results of the ReplaceFile operation for the file '"
-                + cmdHandler.getOptionValue(Constants.FILE_ID_ARG) + "'"
-                + ": ", finalEvent);
-        if(finalEvent.getEventType() == OperationEventType.COMPLETE) {
-            System.exit(Constants.EXIT_SUCCESS);
+        output.completeEvent("Results of the ReplaceFile operation for the file '" + cmdHandler.getOptionValue(FILE_ID_ARG) + "'" + ": ",
+                finalEvent);
+        if (finalEvent.getEventType() == OperationEventType.COMPLETE) {
+            System.exit(EXIT_SUCCESS);
         } else {
-            System.exit(Constants.EXIT_OPERATION_FAILURE);
+            System.exit(EXIT_OPERATION_FAILURE);
         }
     }
 
     /**
      * Initiates the operation and waits for the results.
+     *
      * @return The final event for the results of the operation. Either 'FAILURE' or 'COMPLETE'.
      */
     private OperationEvent replaceTheFile() {
@@ -173,37 +180,36 @@ private OperationEvent replaceTheFile() {
 
         output.debug("Initiating the ReplaceFile conversation.");
         CompleteEventAwaiter eventHandler = new ReplaceFileEventHandler(settings, output);
-        String pillarID = cmdHandler.getOptionValue(Constants.PILLAR_ARG);
+        String pillarID = cmdHandler.getOptionValue(PILLAR_ARG);
 
         if (requestChecksum != null) {
             output.resultHeader("PillarId results");
         }
 
-        client.replaceFile(getCollectionID(), fileID, pillarID, replaceValidationChecksum,
-                requestChecksum, url, getSizeOfFileOrZero(), newValidationChecksum, 
-                requestChecksum, eventHandler, null);
+        client.replaceFile(getCollectionID(), fileID, pillarID, replaceValidationChecksum, requestChecksum, url, getSizeOfFileOrZero(),
+                newValidationChecksum, requestChecksum, eventHandler, null);
 
-        OperationEvent finalEvent = eventHandler.getFinish(); 
+        OperationEvent finalEvent = eventHandler.getFinish();
 
-        if(cmdHandler.hasOption(Constants.DELETE_FILE_ARG)) {
+        if (cmdHandler.hasOption(DELETE_FILE_ARG)) {
             deleteFileAfterwards(url);
         }
 
         return finalEvent;
     }
 
-
     /**
-     * Retrieves the Checksum for the pillars to validate, either taken from the actual file, 
+     * Retrieves the Checksum for the pillars to validate, either taken from the actual file,
      * or from the checksum argument.
      * It will be in the default checksum spec type from settings.
+     *
      * @return The checksum validation type.
      */
     protected ChecksumDataForFileTYPE getValidationChecksum() {
-        if(cmdHandler.hasOption(Constants.FILE_ARG)) {
-            return getValidationChecksumDataForFile(findTheFile());            
+        if (cmdHandler.hasOption(FILE_ARG)) {
+            return getValidationChecksumDataForFile(findTheFile());
         } else {
-            return getValidationChecksumDataFromArgument(Constants.REPLACE_CHECKSUM_ARG);
+            return getValidationChecksumDataFromArgument(REPLACE_CHECKSUM_ARG);
         }
     }
 }
diff --git a/bitrepository-client/src/main/java/org/bitrepository/commandline/clients/PagingGetChecksumsClient.java b/bitrepository-client/src/main/java/org/bitrepository/commandline/clients/PagingGetChecksumsClient.java
index 5cc246689..6609c5d12 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/commandline/clients/PagingGetChecksumsClient.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/commandline/clients/PagingGetChecksumsClient.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2013 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -35,38 +35,36 @@
 import java.util.List;
 
 /**
- * Wrapper class for GetChecksumClient to handle paging through large result sets 
+ * Wrapper class for GetChecksumClient to handle paging through large result sets
  */
 public class PagingGetChecksumsClient {
-
     private final GetChecksumsClient client;
     private GetChecksumsResultModel model;
-    private GetChecksumsEventHandler eventHandler;
     private final GetChecksumsOutputFormatter outputFormatter;
     private final OutputHandler outputHandler;
-    private long timeout;
+    private final long timeout;
     private final int pageSize;
-    
+
     public PagingGetChecksumsClient(GetChecksumsClient client, long timeout, int pageSize, GetChecksumsOutputFormatter outputFormatter,
-            OutputHandler outputHandler) {
+                                    OutputHandler outputHandler) {
         this.client = client;
         this.timeout = timeout;
         this.pageSize = pageSize;
         this.outputFormatter = outputFormatter;
         this.outputHandler = outputHandler;
     }
-    
+
     public boolean getChecksums(String collectionID, String fileID, List<String> pillarIDs, ChecksumSpecTYPE checksumSpec) {
         model = new GetChecksumsResultModel(pillarIDs);
         List<String> pillarsToGetFrom = pillarIDs;
         outputFormatter.formatHeader();
-        
-        while(!pillarsToGetFrom.isEmpty()) {
-            eventHandler = new GetChecksumsEventHandler(model, timeout, outputHandler);
+
+        while (!pillarsToGetFrom.isEmpty()) {
+            GetChecksumsEventHandler eventHandler = new GetChecksumsEventHandler(model, timeout, outputHandler);
             ContributorQuery[] queries = makeQuery(pillarsToGetFrom);
             client.getChecksums(collectionID, queries, fileID, checksumSpec, null, eventHandler, null);
             OperationEvent event = eventHandler.getFinish();
-            if(event.getEventType().equals(OperationEvent.OperationEventType.FAILED)) {
+            if (event.getEventType().equals(OperationEvent.OperationEventType.FAILED)) {
                 outputFormatter.formatResult(model.getUncompletedResults());
                 return false;
             }
@@ -76,11 +74,11 @@ public boolean getChecksums(String collectionID, String fileID, List<String> pil
         outputFormatter.formatResult(model.getUncompletedResults());
         return true;
     }
-    
-    
+
+
     private ContributorQuery[] makeQuery(List<String> pillars) {
         List<ContributorQuery> res = new ArrayList<>();
-        for(String pillar : pillars) {
+        for (String pillar : pillars) {
             Date latestResult = model.getLatestContribution(pillar);
             res.add(new ContributorQuery(pillar, latestResult, null, pageSize));
         }
diff --git a/bitrepository-client/src/main/java/org/bitrepository/commandline/clients/PagingGetFileIDsClient.java b/bitrepository-client/src/main/java/org/bitrepository/commandline/clients/PagingGetFileIDsClient.java
index f13604d08..eca451cc5 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/commandline/clients/PagingGetFileIDsClient.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/commandline/clients/PagingGetFileIDsClient.java
@@ -5,26 +5,22 @@
  * Copyright (C) 2010 - 2013 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.commandline.clients;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
 import org.bitrepository.access.ContributorQuery;
 import org.bitrepository.access.getfileids.GetFileIDsClient;
 import org.bitrepository.client.eventhandler.OperationEvent;
@@ -33,39 +29,41 @@
 import org.bitrepository.commandline.outputformatter.GetFileIDsOutputFormatter;
 import org.bitrepository.commandline.resultmodel.GetFileIDsResultModel;
 
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
 /**
- * Wrapper class for GetFileIDsClient to handle paging through large result sets 
+ * Wrapper class for GetFileIDsClient to handle paging through large result sets
  */
 public class PagingGetFileIDsClient {
-
     private final GetFileIDsClient client;
     private GetFileIDsResultModel model;
-    private GetFileIDsEventHandler eventHandler;
-    private GetFileIDsOutputFormatter outputFormatter;
+    private final GetFileIDsOutputFormatter outputFormatter;
     private final OutputHandler outputHandler;
-    private long timeout;
+    private final long timeout;
     private final int pageSize;
-      
+
     public PagingGetFileIDsClient(GetFileIDsClient client, long timeout, int pageSize, GetFileIDsOutputFormatter outputFormatter,
-            OutputHandler outputHandler) {
+                                  OutputHandler outputHandler) {
         this.client = client;
         this.timeout = timeout;
         this.pageSize = pageSize;
         this.outputFormatter = outputFormatter;
         this.outputHandler = outputHandler;
     }
-    
+
     public boolean getFileIDs(String collectionID, String fileID, List<String> pillarIDs) {
         model = new GetFileIDsResultModel(pillarIDs);
         List<String> pillarsToGetFrom = pillarIDs;
         outputFormatter.formatHeader();
-        
-        while(!pillarsToGetFrom.isEmpty()) {
-            eventHandler = new GetFileIDsEventHandler(model, timeout, outputHandler);
+
+        while (!pillarsToGetFrom.isEmpty()) {
+            GetFileIDsEventHandler eventHandler = new GetFileIDsEventHandler(model, timeout, outputHandler);
             ContributorQuery[] queries = makeQuery(pillarsToGetFrom);
             client.getFileIDs(collectionID, queries, fileID, null, eventHandler);
             OperationEvent event = eventHandler.getFinish();
-            if(event.getEventType().equals(OperationEvent.OperationEventType.FAILED)) {
+            if (event.getEventType().equals(OperationEvent.OperationEventType.FAILED)) {
                 outputFormatter.formatResult(model.getUncompletedResults());
                 return false;
             }
@@ -75,10 +73,10 @@ public boolean getFileIDs(String collectionID, String fileID, List<String> pilla
         outputFormatter.formatResult(model.getUncompletedResults());
         return true;
     }
-    
+
     private ContributorQuery[] makeQuery(List<String> pillars) {
         List<ContributorQuery> res = new ArrayList<>();
-        for(String pillar : pillars) {
+        for (String pillar : pillars) {
             Date latestResult = model.getLatestContribution(pillar);
             res.add(new ContributorQuery(pillar, latestResult, null, pageSize));
         }
diff --git a/bitrepository-client/src/main/java/org/bitrepository/commandline/eventhandler/CompleteEventAwaiter.java b/bitrepository-client/src/main/java/org/bitrepository/commandline/eventhandler/CompleteEventAwaiter.java
index 76329fd37..1e40dabfd 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/commandline/eventhandler/CompleteEventAwaiter.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/commandline/eventhandler/CompleteEventAwaiter.java
@@ -5,48 +5,53 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.commandline.eventhandler;
 
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.TimeUnit;
-
 import org.bitrepository.client.eventhandler.EventHandler;
 import org.bitrepository.client.eventhandler.OperationEvent;
 import org.bitrepository.client.eventhandler.OperationEvent.OperationEventType;
 import org.bitrepository.commandline.output.OutputHandler;
 import org.bitrepository.common.settings.Settings;
 
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
+
 /**
  * EventHandler for awaiting an operation to be complete.
  * Just use the 'getFinish()' for awaiting the final event (either FAILURE or COMPLETE).
  */
 public abstract class CompleteEventAwaiter implements EventHandler {
-    /** The amount of milliseconds before the results are required.*/
+    /**
+     * The amount of milliseconds before the results are required.
+     */
     private final Long timeout;
-    /** The handler of the output for this event handler.*/
+    /**
+     * The handler of the output for this event handler.
+     */
     protected final OutputHandler output;
-    
-    /** The queue used to store the received operation events. */
+
+    /**
+     * The queue used to store the received operation events.
+     */
     private final BlockingQueue<OperationEvent> finalEventQueue = new LinkedBlockingQueue<>(1);
 
     /**
-     * Constructor.
-     * @param settings The settings.
+     * @param settings      The settings.
      * @param outputHandler The {@link OutputHandler} for handling outputting results
      */
     public CompleteEventAwaiter(Settings settings, OutputHandler outputHandler) {
@@ -54,27 +59,28 @@ public CompleteEventAwaiter(Settings settings, OutputHandler outputHandler) {
                 + settings.getRepositorySettings().getClientSettings().getOperationTimeout().longValue();
         this.output = outputHandler;
     }
-    
+
     @Override
     public void handleEvent(OperationEvent event) {
-        if(event.getEventType() == OperationEventType.COMPLETE) {
-            output.debug("Complete: " + event.toString());
+        if (event.getEventType() == OperationEventType.COMPLETE) {
+            output.debug("Complete: " + event);
             finalEventQueue.add(event);
-        } else if(event.getEventType() == OperationEventType.FAILED) {
-            output.warn("Failure: " + event.toString());
+        } else if (event.getEventType() == OperationEventType.FAILED) {
+            output.warn("Failure: " + event);
             finalEventQueue.add(event);
-        } else if(event.getEventType() == OperationEventType.COMPONENT_COMPLETE) {
+        } else if (event.getEventType() == OperationEventType.COMPONENT_COMPLETE) {
             handleComponentComplete(event);
         } else {
-            output.debug("Received event: " + event.toString());
+            output.debug("Received event: " + event);
         }
     }
-    
+
     public abstract void handleComponentComplete(OperationEvent event);
-    
+
     /**
-     * Retrieves the final event when the operation finishes. The final event is awaited for 'timeout' amount 
+     * Retrieves the final event when the operation finishes. The final event is awaited for 'timeout' amount
      * of milliseconds. If no final events has occurred, then an InterruptedException is thrown.
+     *
      * @return The final event.
      */
     public OperationEvent getFinish() {
diff --git a/bitrepository-client/src/main/java/org/bitrepository/commandline/eventhandler/DeleteFileEventHandler.java b/bitrepository-client/src/main/java/org/bitrepository/commandline/eventhandler/DeleteFileEventHandler.java
index d53714446..98d79b113 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/commandline/eventhandler/DeleteFileEventHandler.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/commandline/eventhandler/DeleteFileEventHandler.java
@@ -8,12 +8,12 @@
  * it under the terms of the GNU Lesser General Public License as
  * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
@@ -28,14 +28,15 @@
 import org.bitrepository.modify.deletefile.conversation.DeleteFileCompletePillarEvent;
 
 /**
- * Complete event awaiter for Getfile.
+ * Complete event awaiter for GetFile.
  * Prints out checksum results, if any.
  */
 public class DeleteFileEventHandler extends CompleteEventAwaiter {
 
     /**
      * Constructor.
-     * @param settings The {@link Settings}
+     *
+     * @param settings      The {@link Settings}
      * @param outputHandler The {@link OutputHandler} for handling output
      */
     public DeleteFileEventHandler(Settings settings, OutputHandler outputHandler) {
@@ -44,14 +45,16 @@ public DeleteFileEventHandler(Settings settings, OutputHandler outputHandler) {
 
     @Override
     public void handleComponentComplete(OperationEvent event) {
-        if(!(event instanceof DeleteFileCompletePillarEvent)) {
+        if (!(event instanceof DeleteFileCompletePillarEvent)) {
             output.warn("DeleteFileEventHandler received a component complete, which is not a "
                     + DeleteFileCompletePillarEvent.class.getName());
         }
-        
+
+        assert event instanceof DeleteFileCompletePillarEvent;
         DeleteFileCompletePillarEvent pillarEvent = (DeleteFileCompletePillarEvent) event;
-        if(pillarEvent.getChecksums() != null) {
-            output.resultLine(pillarEvent.getContributorID() + " \t " + Base16Utils.decodeBase16(pillarEvent.getChecksums().getChecksumValue()));
+        if (pillarEvent.getChecksums() != null) {
+            output.resultLine(
+                    pillarEvent.getContributorID() + " \t " + Base16Utils.decodeBase16(pillarEvent.getChecksums().getChecksumValue()));
         }
     }
 
diff --git a/bitrepository-client/src/main/java/org/bitrepository/commandline/eventhandler/GetChecksumsEventHandler.java b/bitrepository-client/src/main/java/org/bitrepository/commandline/eventhandler/GetChecksumsEventHandler.java
index 558a4a100..4b2808976 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/commandline/eventhandler/GetChecksumsEventHandler.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/commandline/eventhandler/GetChecksumsEventHandler.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2013 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -27,24 +27,24 @@
 import org.bitrepository.commandline.resultmodel.GetChecksumsResultModel;
 
 /**
- * Event handler for paging through GetChecksums results 
+ * Event handler for paging through GetChecksums results
  */
 public class GetChecksumsEventHandler extends PagingEventHandler {
 
-    private GetChecksumsResultModel model;
-    
+    private final GetChecksumsResultModel model;
+
     public GetChecksumsEventHandler(GetChecksumsResultModel model, Long timeout, OutputHandler outputHandler) {
         super(timeout, outputHandler);
         this.model = model;
     }
 
     protected void handleResult(OperationEvent event) {
-        if(event instanceof ChecksumsCompletePillarEvent) {
+        if (event instanceof ChecksumsCompletePillarEvent) {
             ChecksumsCompletePillarEvent pillarEvent = (ChecksumsCompletePillarEvent) event;
-            if(pillarEvent.isPartialResult()) {
+            if (pillarEvent.isPartialResult()) {
                 pillarsWithPartialResults.add(pillarEvent.getContributorID());
             }
             model.addResults(pillarEvent.getContributorID(), pillarEvent.getChecksums());
-        } 
+        }
     }
 }
diff --git a/bitrepository-client/src/main/java/org/bitrepository/commandline/eventhandler/GetFileEventHandler.java b/bitrepository-client/src/main/java/org/bitrepository/commandline/eventhandler/GetFileEventHandler.java
index 8ee8a88cd..307368203 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/commandline/eventhandler/GetFileEventHandler.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/commandline/eventhandler/GetFileEventHandler.java
@@ -8,12 +8,12 @@
  * it under the terms of the GNU Lesser General Public License as
  * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
@@ -26,14 +26,15 @@
 import org.bitrepository.common.settings.Settings;
 
 /**
- * Complete event awaiter for Getfile.
- * Nothing to add. 
+ * Complete event awaiter for GetFile.
+ * Nothing to add.
  */
 public class GetFileEventHandler extends CompleteEventAwaiter {
 
     /**
      * Constructor.
-     * @param settings The {@link Settings} 
+     *
+     * @param settings      The {@link Settings}
      * @param outputHandler The {@link OutputHandler} for handling output
      */
     public GetFileEventHandler(Settings settings, OutputHandler outputHandler) {
@@ -41,5 +42,5 @@ public GetFileEventHandler(Settings settings, OutputHandler outputHandler) {
     }
 
     @Override
-    public void handleComponentComplete(OperationEvent event) { }
+    public void handleComponentComplete(OperationEvent event) {}
 }
diff --git a/bitrepository-client/src/main/java/org/bitrepository/commandline/eventhandler/GetFileIDsEventHandler.java b/bitrepository-client/src/main/java/org/bitrepository/commandline/eventhandler/GetFileIDsEventHandler.java
index bad3e8eac..58927d1ca 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/commandline/eventhandler/GetFileIDsEventHandler.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/commandline/eventhandler/GetFileIDsEventHandler.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2013 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -27,20 +27,20 @@
 import org.bitrepository.commandline.resultmodel.GetFileIDsResultModel;
 
 /**
- * Event handler for paging through GetFileIDs results 
+ * Event handler for paging through GetFileIDs results
  */
 public class GetFileIDsEventHandler extends PagingEventHandler {
-    private GetFileIDsResultModel model;
-    
+    private final GetFileIDsResultModel model;
+
     public GetFileIDsEventHandler(GetFileIDsResultModel model, Long timeout, OutputHandler outputHandler) {
         super(timeout, outputHandler);
         this.model = model;
     }
-    
+
     protected void handleResult(OperationEvent event) {
-        if(event instanceof FileIDsCompletePillarEvent) {
+        if (event instanceof FileIDsCompletePillarEvent) {
             FileIDsCompletePillarEvent pillarEvent = (FileIDsCompletePillarEvent) event;
-            if(pillarEvent.isPartialResult()) {
+            if (pillarEvent.isPartialResult()) {
                 pillarsWithPartialResults.add(pillarEvent.getContributorID());
             }
             model.addResults(pillarEvent.getContributorID(), pillarEvent.getFileIDs());
diff --git a/bitrepository-client/src/main/java/org/bitrepository/commandline/eventhandler/PagingEventHandler.java b/bitrepository-client/src/main/java/org/bitrepository/commandline/eventhandler/PagingEventHandler.java
index 1591ad692..e8d31a170 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/commandline/eventhandler/PagingEventHandler.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/commandline/eventhandler/PagingEventHandler.java
@@ -5,68 +5,66 @@
  * Copyright (C) 2010 - 2013 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.commandline.eventhandler;
 
+import org.bitrepository.client.eventhandler.EventHandler;
+import org.bitrepository.client.eventhandler.OperationEvent;
+import org.bitrepository.client.eventhandler.OperationEvent.OperationEventType;
+import org.bitrepository.commandline.output.OutputHandler;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
 
-import org.bitrepository.client.eventhandler.EventHandler;
-import org.bitrepository.client.eventhandler.OperationEvent;
-import org.bitrepository.client.eventhandler.OperationEvent.OperationEventType;
-import org.bitrepository.commandline.output.OutputHandler;
-
 /**
- * Event handler for operations that need paging functionality. 
+ * Event handler for operations that need paging functionality.
  */
 public abstract class PagingEventHandler implements EventHandler {
-
-    /** The amount of milliseconds before the results are required.*/
     private final Long timeout;
-    /** The queue used to store the received operation events. */
     private final BlockingQueue<OperationEvent> finalEventQueue = new LinkedBlockingQueue<>(1);
-    
+
     protected List<String> pillarsWithPartialResults = new ArrayList<>();
-    
+
     private final OutputHandler outputHandler;
 
     public PagingEventHandler(Long timeout, OutputHandler outputHandler) {
         this.timeout = timeout;
         this.outputHandler = outputHandler;
     }
-    
+
     @Override
     public void handleEvent(OperationEvent event) {
-        if(event.getEventType() == OperationEventType.COMPONENT_COMPLETE) {
+        if (event.getEventType() == OperationEventType.COMPONENT_COMPLETE) {
             handleResult(event);
-        } else if(event.getEventType() == OperationEventType.COMPLETE) {
+        } else if (event.getEventType() == OperationEventType.COMPLETE) {
             finalEventQueue.add(event);
-        } else if(event.getEventType() == OperationEventType.FAILED) {
+        } else if (event.getEventType() == OperationEventType.FAILED) {
             finalEventQueue.add(event);
         } else {
-            outputHandler.debug("Received event: " + event.toString());
+            outputHandler.debug("Received event: " + event);
         }
     }
-    
+
     /**
-     * Retrieves the final event when the operation finishes. The final event is awaited for 'timeout' amount 
+     * Retrieves the final event when the operation finishes. The final event is awaited for 'timeout' amount
      * of milliseconds. If no final events has occurred, then an IllegalStateException is thrown.
+     *
      * @return The final event.
      */
     public OperationEvent getFinish() {
@@ -76,14 +74,15 @@ public OperationEvent getFinish() {
             throw new IllegalStateException("Interrupted while waiting for the final response.", e);
         }
     }
-    
+
     /**
-     * Gets the list of pillars who's latest result was partial, i.e. the pillars that needs to deliver more results
-     * @return the list of pillarIDs.  
+     * Gets the list of pillars who most recently gave a partial result, i.e. the pillars that need to deliver more results.
+     *
+     * @return the list of pillarIDs.
      */
     public List<String> getPillarsWithPartialResults() {
         return pillarsWithPartialResults;
     }
-    
+
     protected abstract void handleResult(OperationEvent event);
 }
diff --git a/bitrepository-client/src/main/java/org/bitrepository/commandline/eventhandler/PutFileEventHandler.java b/bitrepository-client/src/main/java/org/bitrepository/commandline/eventhandler/PutFileEventHandler.java
index 9be4e724f..3afe45335 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/commandline/eventhandler/PutFileEventHandler.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/commandline/eventhandler/PutFileEventHandler.java
@@ -8,12 +8,12 @@
  * it under the terms of the GNU Lesser General Public License as
  * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
@@ -28,38 +28,41 @@
 import org.bitrepository.modify.putfile.conversation.PutFileCompletePillarEvent;
 
 /**
- * Complete event awaiter for Getfile.
+ * Complete event awaiter for GetFile.
  * Prints out checksum results, if any.
  */
 public class PutFileEventHandler extends CompleteEventAwaiter {
 
     private final Boolean printOutput;
-    
+
     /**
      * Constructor.
-     * @param settings The {@link Settings}
+     *
+     * @param settings      The {@link Settings}
      * @param outputHandler The {@link OutputHandler} for handling output
-     * @param printOutput Setting for determining if output should be printet
+     * @param printOutput   Setting for determining if output should be printed.
      */
     public PutFileEventHandler(Settings settings, OutputHandler outputHandler, boolean printOutput) {
         super(settings, outputHandler);
         this.printOutput = printOutput;
-        
-        if(printOutput) {
+
+        if (printOutput) {
             output.resultHeader("PillarId \t Checksum");
         }
     }
 
     @Override
     public void handleComponentComplete(OperationEvent event) {
-        if(!(event instanceof PutFileCompletePillarEvent)) {
+        if (!(event instanceof PutFileCompletePillarEvent)) {
             output.warn("PutFileEventHandler received a component complete, which is not a "
                     + PutFileCompletePillarEvent.class.getName());
         }
-        
+
+        assert event instanceof PutFileCompletePillarEvent;
         PutFileCompletePillarEvent pillarEvent = (PutFileCompletePillarEvent) event;
-        if(printOutput && pillarEvent.getChecksums() != null) {
-            output.resultLine(pillarEvent.getContributorID() + " \t " + Base16Utils.decodeBase16(pillarEvent.getChecksums().getChecksumValue()));
+        if (printOutput && pillarEvent.getChecksums() != null) {
+            output.resultLine(
+                    pillarEvent.getContributorID() + " \t " + Base16Utils.decodeBase16(pillarEvent.getChecksums().getChecksumValue()));
         }
     }
 
diff --git a/bitrepository-client/src/main/java/org/bitrepository/commandline/eventhandler/ReplaceFileEventHandler.java b/bitrepository-client/src/main/java/org/bitrepository/commandline/eventhandler/ReplaceFileEventHandler.java
index 950e84bb1..c6e9d4e6a 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/commandline/eventhandler/ReplaceFileEventHandler.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/commandline/eventhandler/ReplaceFileEventHandler.java
@@ -8,12 +8,12 @@
  * it under the terms of the GNU Lesser General Public License as
  * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
@@ -35,7 +35,8 @@ public class ReplaceFileEventHandler extends CompleteEventAwaiter {
 
     /**
      * Constructor.
-     * @param settings The settings.
+     *
+     * @param settings      The settings.
      * @param outputHandler The output handler.
      */
     public ReplaceFileEventHandler(Settings settings, OutputHandler outputHandler) {
@@ -44,25 +45,26 @@ public ReplaceFileEventHandler(Settings settings, OutputHandler outputHandler) {
 
     @Override
     public void handleComponentComplete(OperationEvent event) {
-        if(!(event instanceof ReplaceFileCompletePillarEvent)) {
-            output.warn("ReplaceFileEventHandler received a component complete, which is not a "
-                    + ReplaceFileCompletePillarEvent.class.getName());
+        if (!(event instanceof ReplaceFileCompletePillarEvent)) {
+            output.warn("ReplaceFileEventHandler received a component complete, which is not a " +
+                    ReplaceFileCompletePillarEvent.class.getName());
         }
-        
+
+        assert event instanceof ReplaceFileCompletePillarEvent;
         ReplaceFileCompletePillarEvent pillarEvent = (ReplaceFileCompletePillarEvent) event;
         StringBuilder componentText = new StringBuilder();
-        if(pillarEvent.getChecksumForReplacedFile() != null) {
-            componentText.append("Checksum for replaced file: " 
-                    + Base16Utils.decodeBase16(pillarEvent.getChecksumForReplacedFile().getChecksumValue()) + "\t");
+        if (pillarEvent.getChecksumForReplacedFile() != null) {
+            componentText.append("Checksum for replaced file: ")
+                    .append(Base16Utils.decodeBase16(pillarEvent.getChecksumForReplacedFile().getChecksumValue())).append("\t");
         }
-        
-        if(pillarEvent.getChecksumForNewFile() != null) {
-            componentText.append("Checksum for new file: " 
-                    + Base16Utils.decodeBase16(pillarEvent.getChecksumForNewFile().getChecksumValue()) + "\t");
+
+        if (pillarEvent.getChecksumForNewFile() != null) {
+            componentText.append("Checksum for new file: ")
+                    .append(Base16Utils.decodeBase16(pillarEvent.getChecksumForNewFile().getChecksumValue())).append("\t");
         }
-        
-        if(componentText.length() != 0) {
-            output.resultLine(pillarEvent.getContributorID() + " : \t" + componentText.toString());
+
+        if (componentText.length() != 0) {
+            output.resultLine(pillarEvent.getContributorID() + " : \t" + componentText);
         }
     }
 }
diff --git a/bitrepository-client/src/main/java/org/bitrepository/commandline/output/DefaultOutputHandler.java b/bitrepository-client/src/main/java/org/bitrepository/commandline/output/DefaultOutputHandler.java
index aafe9ab2b..839319137 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/commandline/output/DefaultOutputHandler.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/commandline/output/DefaultOutputHandler.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -31,7 +31,7 @@
 public class DefaultOutputHandler implements OutputHandler {
     private final Logger log;
     private boolean verbose = false;
-    
+
     /**
      * @param c The class for whom to handle the output.
      */
@@ -39,7 +39,7 @@ public class DefaultOutputHandler implements OutputHandler {
     public DefaultOutputHandler(Class c) {
         log = LoggerFactory.getLogger(c);
     }
-    
+
     @Override
     public void debug(String debug) {
         log.debug(debug);
@@ -47,7 +47,7 @@ public void debug(String debug) {
 
     @Override
     public void startupInfo(String s) {
-        if(verbose) {
+        if (verbose) {
             System.err.println(s);
         }
     }
@@ -57,7 +57,7 @@ public void warn(String warning) {
         System.err.println(warning);
         log.warn(warning);
     }
-    
+
     @Override
     public void error(String error, Throwable e) {
         System.err.println(error);
@@ -72,7 +72,7 @@ public void error(String error) {
 
     @Override
     public void completeEvent(String msg, OperationEvent event) {
-        if(verbose) {
+        if (verbose) {
             System.err.println("Final Result: " + event.getEventType());
         }
         log.info(msg);
@@ -88,7 +88,7 @@ public void resultLine(String line) {
     public void resultHeader(String header) {
         System.out.println(header);
     }
-    
+
     public void setVerbosity(boolean verbose) {
         this.verbose = verbose;
     }
diff --git a/bitrepository-client/src/main/java/org/bitrepository/commandline/output/OutputHandler.java b/bitrepository-client/src/main/java/org/bitrepository/commandline/output/OutputHandler.java
index 2008ec0ce..b73494427 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/commandline/output/OutputHandler.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/commandline/output/OutputHandler.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -29,56 +29,65 @@
 public interface OutputHandler {
     /**
      * Handles the debug information for the commandline client.
+     *
      * @param debug The debug information to be handled.
      */
     void debug(String debug);
-    
+
     /**
-     * Handles the startup information for the commandline client.  
+     * Handles the startup information for the commandline client.
+     *
      * @param info The information to be handled.
      */
     void startupInfo(String info);
-    
+
     /**
      * Handles the complete events.
-     * @param msg The message regarding the complete event.
+     *
+     * @param msg   The message regarding the complete event.
      * @param event The final event to handle.
      */
     void completeEvent(String msg, OperationEvent event);
-    
+
     /**
      * Handles a warning for the commandline client.
+     *
      * @param warning The warning to be handled.
      */
     void warn(String warning);
-    
-    /** 
+
+    /**
      * Handles an error.
+     *
      * @param error The message for the error.
      */
     void error(String error);
 
     /**
      * Handles an error.
+     *
      * @param error The message for the error.
-     * @param e The throwable for the error.
+     * @param e     The throwable for the error.
      */
     void error(String error, Throwable e);
-    
+
     /**
-     * Handles the outputting of a line of results 
+     * Handles the outputting of a line of results
+     *
      * @param line the line to output
      */
     void resultLine(String line);
-    
+
     /**
-     * Handles the outputting of the header (or ledgend) of the following lines
+     * Handles the outputting of the header of the following lines
+     *
      * @param header the header to output
      */
     void resultHeader(String header);
-    
+
     /**
-     * To set or unset if the output handler should behave verbosely or not. 
+     * To set or unset if the output handler should behave verbosely or not.
+     *
      * @param verbose The verbosity setting
      */
     void setVerbosity(boolean verbose);
diff --git a/bitrepository-client/src/main/java/org/bitrepository/commandline/outputformatter/GetChecksumDistributionFormatter.java b/bitrepository-client/src/main/java/org/bitrepository/commandline/outputformatter/GetChecksumDistributionFormatter.java
index 1aec1e8b4..689934fa1 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/commandline/outputformatter/GetChecksumDistributionFormatter.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/commandline/outputformatter/GetChecksumDistributionFormatter.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2013 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -33,60 +33,62 @@
 /**
  * Class to deliver GetChecksums client output in a format showing the distribution of the checksum between the pillars.
  * Output format 'style' is 'info' i.e.
- * Tab separated columns with the columns: 
+ * Tab separated columns with the columns:
  * Count FileID Checksum Pillars
- * 
+ * <p>
  * If all pillars agree, then the 'pillars' will just say 'All'.
  */
 public class GetChecksumDistributionFormatter implements GetChecksumsOutputFormatter {
 
     private final OutputHandler outputHandler;
     final static String header = "Count: \tChecksum: \tPillars: \tFileID: ";
-    
+
     public GetChecksumDistributionFormatter(OutputHandler outputHandler) {
         this.outputHandler = outputHandler;
     }
-    
+
     @Override
     public void formatHeader() {
         outputHandler.resultHeader(header);
     }
-    
+
     @Override
     public void formatResult(Collection<ChecksumResult> results) {
-        for(ChecksumResult result : results) {
-            if(result.isDirty()) {
+        for (ChecksumResult result : results) {
+            if (result.isDirty()) {
                 printInconsistency(result);
             } else {
-                outputHandler.resultLine(result.getContributors().size() + " \t" 
+                outputHandler.resultLine(result.getContributors().size() + " \t"
                         + result.getChecksum(result.getContributors().get(0)) + " \tAll \t" + result.getID());
             }
         }
     }
-    
+
     /**
-     * Prints the different checksums along with the pillar distribution amongst these checksums. 
+     * Prints the different checksums along with the pillar distribution amongst these checksums.
+     *
      * @param result The checksum results to format the inconsistency distribution upon.
      */
     private void printInconsistency(ChecksumResult result) {
-        for(Map.Entry<String, List<String>> checksumsDistribution : retrieveChecksumDistribution(result).entrySet()) {
-            outputHandler.resultLine(checksumsDistribution.getValue().size()  + " \t" 
-                    + checksumsDistribution.getKey() + " \t" + checksumsDistribution.getValue()+ " \t" + result.getID());                    
+        for (Map.Entry<String, List<String>> checksumsDistribution : retrieveChecksumDistribution(result).entrySet()) {
+            outputHandler.resultLine(checksumsDistribution.getValue().size() + " \t"
+                    + checksumsDistribution.getKey() + " \t" + checksumsDistribution.getValue() + " \t" + result.getID());
         }
     }
-    
+
     /**
      * Creates the map between a checksum and the list of pillars having the checksum.
+     *
      * @param result The checksum results.
      * @return The map between checksum and pillars.
      */
     private Map<String, List<String>> retrieveChecksumDistribution(ChecksumResult result) {
         Map<String, List<String>> res = new HashMap<>();
-        
-        for(String pillarID : result.getContributors()){
+
+        for (String pillarID : result.getContributors()) {
             String checksum = result.getChecksum(pillarID);
             List<String> pillarIDs;
-            if(res.containsKey(checksum)) {
+            if (res.containsKey(checksum)) {
                 pillarIDs = res.get(checksum);
             } else {
                 pillarIDs = new ArrayList<>();
@@ -94,7 +96,7 @@ private Map<String, List<String>> retrieveChecksumDistribution(ChecksumResult re
             pillarIDs.add(pillarID);
             res.put(checksum, pillarIDs);
         }
-        
+
         return res;
     }
 }
diff --git a/bitrepository-client/src/main/java/org/bitrepository/commandline/outputformatter/GetChecksumsInfoFormatter.java b/bitrepository-client/src/main/java/org/bitrepository/commandline/outputformatter/GetChecksumsInfoFormatter.java
index 014b4dd5c..e8630e39c 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/commandline/outputformatter/GetChecksumsInfoFormatter.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/commandline/outputformatter/GetChecksumsInfoFormatter.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2013 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -27,32 +27,32 @@
 import java.util.Collection;
 
 /**
- * Class to format GetChecksums client output. 
+ * Class to format GetChecksums client output.
  * Output format 'style' is 'info' i.e.
- * Tab separated columns with the columns: 
- * Count Checksum FileID 
+ * Tab separated columns with the columns:
+ * Count Checksum FileID
  */
 public class GetChecksumsInfoFormatter implements GetChecksumsOutputFormatter {
 
     private final OutputHandler outputHandler;
     final static String header = "Checksum: \tCount: \tFileID:";
-    
+
     public GetChecksumsInfoFormatter(OutputHandler outputHandler) {
         this.outputHandler = outputHandler;
     }
-    
+
     @Override
     public void formatHeader() {
         outputHandler.resultHeader(header);
     }
-    
+
     @Override
     public void formatResult(Collection<ChecksumResult> results) {
         String firstContributor;
         String checksum;
-        for(ChecksumResult result : results) {
+        for (ChecksumResult result : results) {
             firstContributor = result.getContributors().get(0);
-            if(result.isDirty()) {
+            if (result.isDirty()) {
                 checksum = "disagreed";
             } else {
                 checksum = result.getChecksum(firstContributor);
diff --git a/bitrepository-client/src/main/java/org/bitrepository/commandline/outputformatter/GetChecksumsOutputFormatter.java b/bitrepository-client/src/main/java/org/bitrepository/commandline/outputformatter/GetChecksumsOutputFormatter.java
index 26f29bb2b..8fea71638 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/commandline/outputformatter/GetChecksumsOutputFormatter.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/commandline/outputformatter/GetChecksumsOutputFormatter.java
@@ -5,39 +5,40 @@
  * Copyright (C) 2010 - 2013 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.commandline.outputformatter;
 
-import java.util.Collection;
-
 import org.bitrepository.commandline.resultmodel.ChecksumResult;
 
+import java.util.Collection;
+
 /**
- * Classes for formatting and outputting results from the GetFileIDs client 
+ * Classes for formatting and outputting results from the GetFileIDs client
  */
 public interface GetChecksumsOutputFormatter {
 
     /**
-     * Format and output the result header 
+     * Format and output the result header
      */
     void formatHeader();
-    
+
     /**
-     * Format and output a result line 
-     * @param results The results to outout
+     * Format and output a result line
+     *
+     * @param results The results to output.
      */
     void formatResult(Collection<ChecksumResult> results);
 }
diff --git a/bitrepository-client/src/main/java/org/bitrepository/commandline/outputformatter/GetFileIDsInfoFormatter.java b/bitrepository-client/src/main/java/org/bitrepository/commandline/outputformatter/GetFileIDsInfoFormatter.java
index 763e46378..d3ed05def 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/commandline/outputformatter/GetFileIDsInfoFormatter.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/commandline/outputformatter/GetFileIDsInfoFormatter.java
@@ -5,52 +5,52 @@
  * Copyright (C) 2010 - 2013 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.commandline.outputformatter;
 
-import java.util.Collection;
-
 import org.bitrepository.commandline.output.OutputHandler;
 import org.bitrepository.commandline.resultmodel.FileIDsResult;
 
+import java.util.Collection;
+
 /**
- * Class to format GetFileIDs client output. 
+ * Class to format GetFileIDs client output.
  * Output format 'style' is 'info' i.e.
- * Tab separated columns with the columns: 
- * Count Size FileID 
+ * Tab separated columns with the columns:
+ * Count Size FileID
  */
 public class GetFileIDsInfoFormatter implements GetFileIDsOutputFormatter {
 
     private final OutputHandler outputHandler;
     final static String header = "Count: \tSize: \tFileID:";
-    
+
     public GetFileIDsInfoFormatter(OutputHandler outputHandler) {
         this.outputHandler = outputHandler;
     }
-    
+
     public void formatHeader() {
         outputHandler.resultHeader(header);
     }
-    
+
     public void formatResult(Collection<FileIDsResult> results) {
-        for(FileIDsResult result : results) {
+        for (FileIDsResult result : results) {
             String filesize;
-            if(result.getSize() == null) {
+            if (result.getSize() == null) {
                 filesize = "???";
-            } else if(result.getSize().intValue() == -1) {
+            } else if (result.getSize().intValue() == -1) {
                 filesize = "disagreed";
             } else {
                 filesize = result.getSize().toString();
diff --git a/bitrepository-client/src/main/java/org/bitrepository/commandline/outputformatter/GetFileIDsOutputFormatter.java b/bitrepository-client/src/main/java/org/bitrepository/commandline/outputformatter/GetFileIDsOutputFormatter.java
index 8cb75539b..e7b47b096 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/commandline/outputformatter/GetFileIDsOutputFormatter.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/commandline/outputformatter/GetFileIDsOutputFormatter.java
@@ -5,39 +5,40 @@
  * Copyright (C) 2010 - 2013 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.commandline.outputformatter;
 
-import java.util.Collection;
-
 import org.bitrepository.commandline.resultmodel.FileIDsResult;
 
+import java.util.Collection;
+
 /**
- * Classes for formatting and outputting results from the GetFileIDs client 
+ * Classes for formatting and outputting results from the GetFileIDs client
  */
 public interface GetFileIDsOutputFormatter {
 
     /**
-     * Format and output the result header 
+     * Format and output the result header
      */
     void formatHeader();
-    
+
     /**
      * Format and output a result line
-     * @param results The results to format 
+     *
+     * @param results The results to format
      */
     void formatResult(Collection<FileIDsResult> results);
 }
diff --git a/bitrepository-client/src/main/java/org/bitrepository/commandline/resultmodel/ChecksumResult.java b/bitrepository-client/src/main/java/org/bitrepository/commandline/resultmodel/ChecksumResult.java
index 162616226..9424e358c 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/commandline/resultmodel/ChecksumResult.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/commandline/resultmodel/ChecksumResult.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2013 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -28,48 +28,57 @@
 
 public class ChecksumResult {
 
-    /** FileID */
+    /**
+     * FileID
+     */
     private final String id;
-    /** Mapping from pillar/contributorid to returned checksum */
+    /**
+     * Mapping from pillar/contributorID to returned checksum
+     */
     private final Map<String, String> pillarChecksumMap;
-    /** Indication if there's checksum disagreement */
+    /**
+     * Indication if there's checksum disagreement
+     */
     private boolean dirty;
-    
+
     public ChecksumResult(String id, String contributor, String checksum) {
         pillarChecksumMap = new HashMap<>();
         this.id = id;
         dirty = false;
         pillarChecksumMap.put(contributor, checksum);
     }
-    
+
     /**
-     * Add a contributor with it's checksum to the result
+     * Add a contributor with its checksum to the result
+     *
      * @param contributor the ID of the contributor
-     * @param checksum the checksum that the contributor delivered
+     * @param checksum    the checksum that the contributor delivered
      */
     public void addContributor(String contributor, String checksum) {
-        if(!dirty && !pillarChecksumMap.containsValue(checksum)) {
+        if (!dirty && !pillarChecksumMap.containsValue(checksum)) {
             dirty = true;
         }
         pillarChecksumMap.put(contributor, checksum);
     }
-    
+
     /**
      * Is the result 'dirty', i.e. is there checksum disagreement among the answered contributors.
-     * @return false if all contributors have agreed on the checksum.  
+     *
+     * @return false if all contributors have agreed on the checksum.
      */
     public boolean isDirty() {
         return dirty;
     }
-    
+
     /**
-     * Get the list of contributors. 
-     * @return the set of contributors which have delivered a checksum 
+     * Get the list of contributors.
+     *
+     * @return the set of contributors which have delivered a checksum
      */
     public List<String> getContributors() {
         return new ArrayList<>(pillarChecksumMap.keySet());
     }
-    
+
     /**
      * @param contributor The contributor to get the checksum for
      * @return the checksum from a given contributor
@@ -77,19 +86,21 @@ public List<String> getContributors() {
     public String getChecksum(String contributor) {
         return pillarChecksumMap.get(contributor);
     }
-    
+
     /**
      * Get the fileID of the file for which the checksum is for.
-     * @return String, the fileID 
+     *
+     * @return String, the fileID
      */
     public String getID() {
         return id;
     }
-    
+
     /**
      * Determine if we have enough answers to consider the result complete
+     *
      * @param expectedNumberOfContributors the expected number of contributors.
-     * @return true, if there's registered expectedNumberOfContributors of contributors.  
+     * @return true, if there's registered expectedNumberOfContributors of contributors.
      */
     public boolean isComplete(int expectedNumberOfContributors) {
         return (pillarChecksumMap.size() == expectedNumberOfContributors);
diff --git a/bitrepository-client/src/main/java/org/bitrepository/commandline/resultmodel/FileIDsResult.java b/bitrepository-client/src/main/java/org/bitrepository/commandline/resultmodel/FileIDsResult.java
index 935621552..e986b6978 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/commandline/resultmodel/FileIDsResult.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/commandline/resultmodel/FileIDsResult.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2013 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -26,72 +26,83 @@
 import java.util.List;
 
 /**
- * Class for temporary storage of FileIDs result information 
+ * Class for temporary storage of FileIDs result information
  */
 public class FileIDsResult {
 
-    /** FileID */
+    /**
+     * FileID
+     */
     private final String id;
-    /** Size of the file */
+    /**
+     * Size of the file
+     */
     private BigInteger size;
-    /** List of contributors reported to have the file. */
-    private List<String> contributors;
-    
+    /**
+     * List of contributors reported to have the file.
+     */
+    private final List<String> contributors;
+
     public FileIDsResult(String id, BigInteger size, String contributor) {
         this.id = id;
         this.size = size;
         contributors = new ArrayList<>();
         contributors.add(contributor);
     }
-    
+
     /**
-     * Updates the filesize of the file, if the filesize does not match, mark it as a unknown  
+     * Updates the filesize of the file, if the filesize does not match, mark it as an unknown
+     *
      * @param updateSize The file size to update with
      */
     public void updateSize(BigInteger updateSize) {
-        if(updateSize != null) {
-            if(size == null) {
-                size = updateSize; 
-            } else if(!updateSize.equals(size)) {
+        if (updateSize != null) {
+            if (size == null) {
+                size = updateSize;
+            } else if (!updateSize.equals(size)) {
                 size = new BigInteger("-1");
-            }    
-        } 
+            }
+        }
     }
-    
+
     /**
-     * Gets the size of the file. 
-     * @return the size of the file, or null if unknown or -1 if there are filesize confilicts between contributors 
+     * Gets the size of the file.
+     *
+     * @return the size of the file, or null if unknown or -1 if there are filesize conflicts between contributors
      */
     public BigInteger getSize() {
         return size;
     }
-    
+
     /**
-     * Add a contributor to the list of contributors 
+     * Add a contributor to the list of contributors
+     *
      * @param contributor The contributor to add
      */
     public void addContributor(String contributor) {
-        if(!contributors.contains(contributor)) {
+        if (!contributors.contains(contributor)) {
             contributors.add(contributor);
         }
     }
-    
+
     /**
      * Get the list of contributors
-     * @return the list of contributors 
+     *
+     * @return the list of contributors
      */
     public List<String> getContributors() {
         return contributors;
     }
-    
+
     /**
      * Get the id of the file
-     * @return the fileID 
+     *
+     * @return the fileID
      */
     public String getID() {
         return id;
     }
-    
+
     public boolean isComplete(int numberOfExpectedContributors) {
         return (contributors.size() == numberOfExpectedContributors);
     }
diff --git a/bitrepository-client/src/main/java/org/bitrepository/commandline/resultmodel/GetChecksumsResultModel.java b/bitrepository-client/src/main/java/org/bitrepository/commandline/resultmodel/GetChecksumsResultModel.java
index cb697c5ea..1ae71d7d8 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/commandline/resultmodel/GetChecksumsResultModel.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/commandline/resultmodel/GetChecksumsResultModel.java
@@ -5,22 +5,27 @@
  * Copyright (C) 2010 - 2013 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.commandline.resultmodel;
 
+import org.bitrepository.bitrepositoryelements.ChecksumDataForChecksumSpecTYPE;
+import org.bitrepository.bitrepositoryelements.ResultingChecksums;
+import org.bitrepository.common.utils.Base16Utils;
+import org.bitrepository.common.utils.CalendarUtils;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
@@ -30,95 +35,94 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.bitrepository.bitrepositoryelements.ChecksumDataForChecksumSpecTYPE;
-import org.bitrepository.bitrepositoryelements.ResultingChecksums;
-import org.bitrepository.common.utils.Base16Utils;
-import org.bitrepository.common.utils.CalendarUtils;
-
 /**
  * Model for keeping results from a GetFileIDs call. The model is intended to act as a buffer for
  * completed and uncompleted data. The intention is that completed data can be fetched while the
- * remaining data is still being fetched - this should serve to keep memory use down. 
+ * remaining data is still being fetched - this should serve to keep memory use down.
  */
 public class GetChecksumsResultModel {
-    
+
     private List<ChecksumResult> completeResults;
     private Set<String> lastCompletedIDs;
-    private Map<String, ChecksumResult> uncompleteResults;
-    private Map<String, Date> latestContributorDate;
-    
+    private final Map<String, ChecksumResult> incompleteResults;
+    private final Map<String, Date> latestContributorDate;
+
     public GetChecksumsResultModel(Collection<String> expectedContributors) {
         latestContributorDate = new HashMap<>();
-        for(String contributor : expectedContributors) {
+        for (String contributor : expectedContributors) {
             latestContributorDate.put(contributor, new Date(0));
         }
         completeResults = new ArrayList<>();
         lastCompletedIDs = new HashSet<>();
-        uncompleteResults = new HashMap<>();
+        incompleteResults = new HashMap<>();
     }
-    
+
     /**
      * Add a set of results from a contributor
+     *
      * @param contributor the contributor from which the results are from
-     * @param results the results from the contributor.
+     * @param results     the results from the contributor.
      */
     public void addResults(String contributor, ResultingChecksums results) {
         Date latestContribution = latestContributorDate.get(contributor);
-        for(ChecksumDataForChecksumSpecTYPE item : results.getChecksumDataItems()) {
-            if(lastCompletedIDs.contains(item.getFileID())) {
+        for (ChecksumDataForChecksumSpecTYPE item : results.getChecksumDataItems()) {
+            if (lastCompletedIDs.contains(item.getFileID())) {
                 continue;
             }
             String checksum = Base16Utils.decodeBase16(item.getChecksumValue());
             ChecksumResult result;
-            if(uncompleteResults.containsKey(item.getFileID())) {
-                result = uncompleteResults.get(item.getFileID());
+            if (incompleteResults.containsKey(item.getFileID())) {
+                result = incompleteResults.get(item.getFileID());
                 result.addContributor(contributor, checksum);
             } else {
                 result = new ChecksumResult(item.getFileID(), contributor, checksum);
             }
-            
-            Date resultDate = CalendarUtils.convertFromXMLGregorianCalendar(item.getCalculationTimestamp()); 
-            if(resultDate.after(latestContribution)) {
+
+            Date resultDate = CalendarUtils.convertFromXMLGregorianCalendar(item.getCalculationTimestamp());
+            if (resultDate.after(latestContribution)) {
                 latestContribution = resultDate;
             }
-                        
-            if(result.isComplete(latestContributorDate.size())) {
+
+            if (result.isComplete(latestContributorDate.size())) {
                 completeResults.add(result);
-                uncompleteResults.remove(item.getFileID());
+                incompleteResults.remove(item.getFileID());
             } else {
-                uncompleteResults.put(item.getFileID(), result);
+                incompleteResults.put(item.getFileID(), result);
             }
-        }       
+        }
         latestContributorDate.put(contributor, latestContribution);
     }
-    
+
     /**
-     * Get the collection of completed results (results from which all expected contributors 
-     * delivered their part), the call is NOT idempotent. 
-     * @return The collection of {@link ChecksumResult}s 
-     */    
+     * Get the collection of completed results (results from which all expected contributors
+     * delivered their part), the call is NOT idempotent.
+     *
+     * @return The collection of {@link ChecksumResult}s
+     */
     public Collection<ChecksumResult> getCompletedResults() {
         List<ChecksumResult> completed = completeResults;
         completeResults = null;
         completeResults = new ArrayList<>();
         lastCompletedIDs = new HashSet<>();
-        for(ChecksumResult result : completed) {
+        for (ChecksumResult result : completed) {
             lastCompletedIDs.add(result.getID());
         }
         return completed;
     }
 
     /**
-     * Get the collection of uncompleted results (the results which does not have had contributions 
+     * Get the collection of uncompleted results (the results which does not have had contributions
      * from all expected contributors)
-     * @return The collection of {@link ChecksumResult}s  
-     */    
+     *
+     * @return The collection of {@link ChecksumResult}s
+     */
     public Collection<ChecksumResult> getUncompletedResults() {
-        return uncompleteResults.values();
+        return incompleteResults.values();
     }
-    
+
     /**
      * Get the Date of the latest checksum by the contributor
+     *
      * @param contributor the contributor to get the Date of the latest contribution.
      * @return Date the date of the latest contribution by the given contributor
      */
diff --git a/bitrepository-client/src/main/java/org/bitrepository/commandline/resultmodel/GetFileIDsResultModel.java b/bitrepository-client/src/main/java/org/bitrepository/commandline/resultmodel/GetFileIDsResultModel.java
index d2a2310b7..3231d324a 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/commandline/resultmodel/GetFileIDsResultModel.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/commandline/resultmodel/GetFileIDsResultModel.java
@@ -5,22 +5,26 @@
  * Copyright (C) 2010 - 2013 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.commandline.resultmodel;
 
+import org.bitrepository.bitrepositoryelements.FileIDsDataItem;
+import org.bitrepository.bitrepositoryelements.ResultingFileIDs;
+import org.bitrepository.common.utils.CalendarUtils;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
@@ -30,94 +34,94 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.bitrepository.bitrepositoryelements.FileIDsDataItem;
-import org.bitrepository.bitrepositoryelements.ResultingFileIDs;
-import org.bitrepository.common.utils.CalendarUtils;
-
 /**
  * Model for keeping results from a GetFileIDs call. The model is intended to act as a buffer for
- * completed and uncompleted data. The intension is that completed data can be fetched while the 
- * remaining data is still being fetched - this should serve to keep memory use down. 
+ * completed and uncompleted data. The intention is that completed data can be fetched while the
+ * remaining data is still being fetched - this should serve to keep memory use down.
  */
 public class GetFileIDsResultModel {
 
     private List<FileIDsResult> completeResults;
     private Set<String> lastCompletedIDs;
-    private Map<String, FileIDsResult> uncompleteResults;
-    private Map<String, Date> latestContributorDate;
-        
+    private final Map<String, FileIDsResult> incompleteResults;
+    private final Map<String, Date> latestContributorDate;
+
     public GetFileIDsResultModel(Collection<String> expectedContributors) {
         latestContributorDate = new HashMap<>();
-        for(String contributor : expectedContributors) {
+        for (String contributor : expectedContributors) {
             latestContributorDate.put(contributor, new Date(0));
         }
         completeResults = new ArrayList<>();
         lastCompletedIDs = new HashSet<>();
-        uncompleteResults = new HashMap<>();
+        incompleteResults = new HashMap<>();
     }
-    
+
     /**
      * Add a set of results from a contributor
+     *
      * @param contributor the contributor from which the results are from
-     * @param results the results from the contributor.
+     * @param results     the results from the contributor.
      */
     public void addResults(String contributor, ResultingFileIDs results) {
         Date latestContribution = latestContributorDate.get(contributor);
-        for(FileIDsDataItem item : results.getFileIDsData().getFileIDsDataItems().getFileIDsDataItem()) {
-            if(lastCompletedIDs.contains(item.getFileID())) {
+        for (FileIDsDataItem item : results.getFileIDsData().getFileIDsDataItems().getFileIDsDataItem()) {
+            if (lastCompletedIDs.contains(item.getFileID())) {
                 continue;
             }
             FileIDsResult result;
-            if(uncompleteResults.containsKey(item.getFileID())) {
-                result = uncompleteResults.get(item.getFileID());
+            if (incompleteResults.containsKey(item.getFileID())) {
+                result = incompleteResults.get(item.getFileID());
                 result.updateSize(item.getFileSize());
                 result.addContributor(contributor);
             } else {
                 result = new FileIDsResult(item.getFileID(), item.getFileSize(), contributor);
             }
-            
-            Date resultDate = CalendarUtils.convertFromXMLGregorianCalendar(item.getLastModificationTime()); 
-            if(resultDate.after(latestContribution)) {
+
+            Date resultDate = CalendarUtils.convertFromXMLGregorianCalendar(item.getLastModificationTime());
+            if (resultDate.after(latestContribution)) {
                 latestContribution = resultDate;
             }
-                        
-            if(result.isComplete(latestContributorDate.size())) {
+
+            if (result.isComplete(latestContributorDate.size())) {
                 completeResults.add(result);
-                uncompleteResults.remove(item.getFileID());
+                incompleteResults.remove(item.getFileID());
             } else {
-                uncompleteResults.put(item.getFileID(), result);
+                incompleteResults.put(item.getFileID(), result);
             }
-        }       
+        }
         latestContributorDate.put(contributor, latestContribution);
     }
-    
+
     /**
-     * Get the collection of completed results (results from which all expected contributors 
-     * delivered their part), the call is NOT idempotent. 
-     * @return the collection of {@link FileIDsResult}s 
-     */    
+     * Get the collection of completed results (results from which all expected contributors
+     * delivered their part), the call is NOT idempotent.
+     *
+     * @return the collection of {@link FileIDsResult}s
+     */
     public Collection<FileIDsResult> getCompletedResults() {
         List<FileIDsResult> completed = completeResults;
         completeResults = null;
         completeResults = new ArrayList<>();
         lastCompletedIDs = new HashSet<>();
-        for(FileIDsResult result : completed) {
+        for (FileIDsResult result : completed) {
             lastCompletedIDs.add(result.getID());
         }
         return completed;
     }
 
     /**
-     * Get the collection of uncompleted results (the results which does not have had contributions 
+     * Get the collection of uncompleted results (the results which does not have had contributions
      * from all expected contributors)
-     * @return the collection of {@link FileIDsResult} 
-     */    
+     *
+     * @return the collection of {@link FileIDsResult}
+     */
     public Collection<FileIDsResult> getUncompletedResults() {
-        return uncompleteResults.values();
+        return incompleteResults.values();
     }
-    
+
     /**
      * Get the Date of the latest fileID by the contributor
+     *
      * @param contributor the contributor to get the Date of the latest contribution.
      * @return Date the date of the latest contribution by the given contributor
      */
diff --git a/bitrepository-client/src/main/java/org/bitrepository/commandline/utils/ChecksumExtractionUtils.java b/bitrepository-client/src/main/java/org/bitrepository/commandline/utils/ChecksumExtractionUtils.java
index 8af8fc3f0..1e2035eaf 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/commandline/utils/ChecksumExtractionUtils.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/commandline/utils/ChecksumExtractionUtils.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -35,35 +35,36 @@
 public class ChecksumExtractionUtils {
     /**
      * Extracts the checksum type from the commandline arguments.
-     * Ensures, that the HMAC checksum types is used, when a salt is given, 
+     * Ensures, that the HMAC checksum types is used, when a salt is given,
      * and also that it is not the HMAC checksum type, which is used, when no salt is given.
-     * Also, ignores cases for the checksum types.  
-     * @param cmdHandler Contains the arguments from the commansline.
-     * @param settings The settings, containing the default checksum type (if no checksum type is given).
-     * @param output The OutputHandler, where output and logging information is delivered.
+     * Also, ignores cases for the checksum types.
+     *
+     * @param cmdHandler Contains the arguments from the commandline.
+     * @param settings   The settings, containing the default checksum type (if no checksum type is given).
+     * @param output     The OutputHandler, where output and logging information is delivered.
      * @return The checksum type.
      */
     public static ChecksumType extractChecksumType(CommandLineArgumentsHandler cmdHandler, Settings settings,
-            OutputHandler output) {
+                                                   OutputHandler output) {
         String type;
-        if(cmdHandler.hasOption(Constants.REQUEST_CHECKSUM_TYPE_ARG)) {
+        if (cmdHandler.hasOption(Constants.REQUEST_CHECKSUM_TYPE_ARG)) {
             type = cmdHandler.getOptionValue(Constants.REQUEST_CHECKSUM_TYPE_ARG).toUpperCase(Locale.ROOT);
-        } else { 
+        } else {
             type = ChecksumUtils.getDefault(settings).getChecksumType().name();
         }
-        
-        if(cmdHandler.hasOption(Constants.REQUEST_CHECKSUM_SALT_ARG)) {
-            if(!type.startsWith("HMAC_")) {
+
+        if (cmdHandler.hasOption(Constants.REQUEST_CHECKSUM_SALT_ARG)) {
+            if (!type.startsWith("HMAC_")) {
                 type = "HMAC_" + type;
                 output.debug("Non-HMAC checksum spec given, but also salt. Thus using '" + type + "' instead.");
             }
         } else {
-            if(type.startsWith("HMAC_")) {
+            if (type.startsWith("HMAC_")) {
                 type = type.replace("HMAC_", "");
                 output.warn("HMAC checksum spec given, but no salt given. Using '" + type + "' instead.");
             }
         }
-        
+
         return ChecksumType.fromValue(type);
     }
 }
diff --git a/bitrepository-client/src/main/java/org/bitrepository/commandline/utils/CommandLineArgumentsHandler.java b/bitrepository-client/src/main/java/org/bitrepository/commandline/utils/CommandLineArgumentsHandler.java
index 8d7888cc6..7a841d2d7 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/commandline/utils/CommandLineArgumentsHandler.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/commandline/utils/CommandLineArgumentsHandler.java
@@ -5,25 +5,22 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.commandline.utils;
 
-import java.nio.file.Paths;
-import java.util.Collection;
-
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.CommandLineParser;
 import org.apache.commons.cli.DefaultParser;
@@ -40,43 +37,39 @@
 import org.bitrepository.protocol.security.SecurityManager;
 import org.bitrepository.protocol.security.SecurityManagerUtil;
 
+import java.nio.file.Paths;
+
 /**
  * Interface for handling the command line arguments.
  */
 public class CommandLineArgumentsHandler {
-    /** The parser of the command line arguments.*/
     protected final CommandLineParser parser;
-    /** The options for the command line arguments*/
     protected final Options options;
-    /** The command line. */
     protected CommandLine cmd = null;
-    /** The settings.*/
     protected Settings settings = null;
-    
-    /**
-     * Constructor.
-     */
+
     public CommandLineArgumentsHandler() {
         parser = new DefaultParser();
         options = new Options();
     }
-    
+
     /**
      * Parses the commandline arguments.
+     *
      * @param args The command line arguments to pass.
      * @throws ParseException If the arguments does not parse. E.g. arguments missing or too many arguments.
      */
-    public void parseArguments(String ... args) throws ParseException {
+    public void parseArguments(String... args) throws ParseException {
         cmd = parser.parse(options, args, Constants.NOT_ALLOWING_UNDEFINED_ARGUMENTS);
     }
-    
+
     /**
      * For validating that the command line has been instantiated.
      */
     private void ensureThatCmdHasBeenInitialised() {
         ArgumentValidator.checkNotNull(cmd, "No argument has been parsed from the command line.");
     }
-    
+
     /**
      * Creates the default options for the command line arguments for the clients.
      */
@@ -85,24 +78,24 @@ public void createDefaultOptions() {
                 + "files for the client");
         settingsOption.setRequired(Constants.ARGUMENT_IS_REQUIRED);
         options.addOption(settingsOption);
-        
+
         Option privateKeyOption = new Option(Constants.PRIVATE_KEY_ARG, true, "The path to the file containing "
                 + "the private key.");
-        privateKeyOption.setRequired(Constants.ARGUMENT_IS_NOT_REQUIRED);        
+        privateKeyOption.setRequired(Constants.ARGUMENT_IS_NOT_REQUIRED);
         options.addOption(privateKeyOption);
-        
+
         Option verbosity = new Option(Constants.VERBOSITY_ARG, false, "Makes the client more verbose");
         verbosity.setRequired(Constants.ARGUMENT_IS_NOT_REQUIRED);
         options.addOption(verbosity);
     }
-    
+
     /**
      * @param option The option to add to the command line.
      */
     public void addOption(Option option) {
         options.addOption(option);
     }
-    
+
     /**
      * @param optionName The name of the option to extract the value for.
      * @return The value corresponding to the given option name.
@@ -111,7 +104,7 @@ public String getOptionValue(String optionName) {
         ensureThatCmdHasBeenInitialised();
         return cmd.getOptionValue(optionName);
     }
-    
+
     /**
      * @param optionName The name of the option to validate whether exists.
      * @return Whether any arguments for the options have been given.
@@ -120,37 +113,39 @@ public boolean hasOption(String optionName) {
         ensureThatCmdHasBeenInitialised();
         return cmd.hasOption(optionName);
     }
-    
+
     /**
-     * @return Lists the possible arguments in a human readable format.
+     * @return Lists the possible arguments in a human-readable format.
      */
     public String listArguments() {
         StringBuilder res = new StringBuilder();
         res.append("Takes the following arguments:\n");
-        for(Option option : (Collection<Option>) options.getOptions()) {
-            res.append("-" + option.getOpt() + " " + option.getDescription() + "\n");
+        for (Option option : options.getOptions()) {
+            res.append("-").append(option.getOpt()).append(" ").append(option.getDescription()).append("\n");
         }
         return res.toString();
-    }    
-    
+    }
+
     /**
      * Method for retrieving the settings for the launcher.
      * This will be based on the argument for the path to the settings.
+     *
      * @return The settings.
      */
     public Settings loadSettings() {
         ensureThatCmdHasBeenInitialised();
-        if(settings == null) {
+        if (settings == null) {
             SettingsProvider settingsLoader =
-                new CommandLineSettingsProvider(new XMLFileSettingsLoader(cmd.getOptionValue(Constants.SETTINGS_ARG)));
+                    new CommandLineSettingsProvider(new XMLFileSettingsLoader(cmd.getOptionValue(Constants.SETTINGS_ARG)));
             settings = settingsLoader.getSettings();
         }
         SettingsUtils.initialize(settings);
         return settings;
     }
-    
+
     /**
      * Instantiates the security manager based on the settings and argument for the path to the key file.
+     *
      * @param settings The settings.
      * @return The security manager.
      */
diff --git a/bitrepository-client/src/main/java/org/bitrepository/modify/ModifyComponentFactory.java b/bitrepository-client/src/main/java/org/bitrepository/modify/ModifyComponentFactory.java
index e330da113..73a9a050d 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/modify/ModifyComponentFactory.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/modify/ModifyComponentFactory.java
@@ -1,23 +1,23 @@
 /*
  * #%L
  * Bitmagasin modify client
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -37,20 +37,19 @@
 import org.bitrepository.protocol.security.SecurityManager;
 
 /**
- * Factory class for the access module. 
+ * Factory class for the access module.
  * Instantiates the instances of the interfaces within this module.
  */
 public final class ModifyComponentFactory {
-    /** The singleton instance. */
     private static ModifyComponentFactory instance;
 
     /**
      * Instantiation of this singleton.
-     * 
+     *
      * @return The singleton instance of this factory class.
      */
     public static synchronized ModifyComponentFactory getInstance() {
-        if(instance == null) {
+        if (instance == null) {
             instance = new ModifyComponentFactory();
         }
         return instance;
@@ -63,41 +62,42 @@ private ModifyComponentFactory() {}
 
     /**
      * Method for initialising the PutClient.
-     * @param settings The {@link Settings} for the client
+     *
+     * @param settings        The {@link Settings} for the client
      * @param securityManager The {@link SecurityManager} for the client
-     * @param clientID The ID of the client
+     * @param clientID        The ID of the client
      * @return The configured PutClient.
      */
     public PutFileClient retrievePutClient(Settings settings, SecurityManager securityManager, String clientID) {
         return new ConversationBasedPutFileClient(
-                ProtocolComponentFactory.getInstance().getMessageBus(settings, securityManager), 
-                ConversationMediatorManager.getConversationMediator(settings, securityManager), 
+                ProtocolComponentFactory.getInstance().getMessageBus(settings, securityManager),
+                ConversationMediatorManager.getConversationMediator(settings, securityManager),
                 settings, clientID);
     }
-    
+
     /**
-     * @param settings The {@link Settings} for the client
+     * @param settings        The {@link Settings} for the client
      * @param securityManager The {@link SecurityManager} for the client
-     * @param clientID The ID of the client
+     * @param clientID        The ID of the client
      * @return The requested DeleteClient.
      */
     public DeleteFileClient retrieveDeleteFileClient(Settings settings, SecurityManager securityManager, String clientID) {
         return new ConversationBasedDeleteFileClient(
-                ProtocolComponentFactory.getInstance().getMessageBus(settings, securityManager), 
-                ConversationMediatorManager.getConversationMediator(settings, securityManager), 
+                ProtocolComponentFactory.getInstance().getMessageBus(settings, securityManager),
+                ConversationMediatorManager.getConversationMediator(settings, securityManager),
                 settings, clientID);
     }
-        
+
     /**
-     * @param settings The {@link Settings} for the client
+     * @param settings        The {@link Settings} for the client
      * @param securityManager The {@link SecurityManager} for the client
-     * @param clientID The ID of the client
+     * @param clientID        The ID of the client
      * @return The requested DeleteClient.
      */
     public ReplaceFileClient retrieveReplaceFileClient(Settings settings, SecurityManager securityManager, String clientID) {
         return new ConversationBasedReplaceFileClient(
-                ProtocolComponentFactory.getInstance().getMessageBus(settings, securityManager), 
-                ConversationMediatorManager.getConversationMediator(settings, securityManager), 
+                ProtocolComponentFactory.getInstance().getMessageBus(settings, securityManager),
+                ConversationMediatorManager.getConversationMediator(settings, securityManager),
                 settings, clientID);
     }
 }
diff --git a/bitrepository-client/src/main/java/org/bitrepository/modify/deletefile/BlockingDeleteFileClient.java b/bitrepository-client/src/main/java/org/bitrepository/modify/deletefile/BlockingDeleteFileClient.java
index 4594e5380..0f5f9c3d8 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/modify/deletefile/BlockingDeleteFileClient.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/modify/deletefile/BlockingDeleteFileClient.java
@@ -1,30 +1,29 @@
 /*
  * #%L
  * Bitmagasin modify client
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.modify.deletefile;
 
-import java.util.List;
 import org.bitrepository.bitrepositoryelements.ChecksumDataForFileTYPE;
 import org.bitrepository.bitrepositoryelements.ChecksumSpecTYPE;
 import org.bitrepository.client.eventhandler.BlockingEventHandler;
@@ -33,8 +32,10 @@
 import org.bitrepository.client.eventhandler.OperationEvent;
 import org.bitrepository.common.exceptions.OperationFailedException;
 
+import java.util.List;
+
 /**
- * Wrappes a <code>DeleteFileClient</code> to provide a blocking client. The client will block until the DeleteFileOperation
+ * Wraps a <code>DeleteFileClient</code> to provide a blocking client. The client will block until the DeleteFileOperation
  * has finished.
  */
 public class BlockingDeleteFileClient {
@@ -43,34 +44,29 @@ public class BlockingDeleteFileClient {
     public BlockingDeleteFileClient(DeleteFileClient client) {
         this.client = client;
     }
+
     /**
      * Method for performing a blocking delete file operation.
      *
-     * @param collectionID The ID of the collection
-     * @param fileID The id of the file.
-     * @param pillarID The id of the pillar to delete the file on.
+     * @param collectionID                  The ID of the collection
+     * @param fileID                        The id of the file.
+     * @param pillarID                      The id of the pillar to delete the file on.
      * @param checksumForValidationAtPillar The checksum for validating at pillar side.
      * @param checksumRequestsForValidation The checksum for validating at client side.
-     * @param eventHandler The EventHandler for the operation.
-     * @param auditTrailInformation The audit trail information.
-     * @return The list of {@link ContributorEvent}s received 
+     * @param eventHandler                  The EventHandler for the operation.
+     * @param auditTrailInformation         The audit trail information.
+     * @return The list of {@link ContributorEvent}s received
      * @throws OperationFailedException if the operation failed
      */
-    public List<ContributorEvent> deleteFile(
-            String collectionID,
-            String fileID,
-            String pillarID,
-            ChecksumDataForFileTYPE checksumForValidationAtPillar,
-            ChecksumSpecTYPE checksumRequestsForValidation,
-            EventHandler eventHandler,
-            String auditTrailInformation)
-            throws OperationFailedException {
+    public List<ContributorEvent> deleteFile(String collectionID, String fileID, String pillarID,
+                                             ChecksumDataForFileTYPE checksumForValidationAtPillar,
+                                             ChecksumSpecTYPE checksumRequestsForValidation, EventHandler eventHandler,
+                                             String auditTrailInformation) throws OperationFailedException {
         BlockingEventHandler blocker = new BlockingEventHandler(eventHandler);
-        client.deleteFile(collectionID,  fileID, pillarID, checksumForValidationAtPillar,
-                checksumRequestsForValidation,
-                blocker, auditTrailInformation);
+        client.deleteFile(collectionID, fileID, pillarID, checksumForValidationAtPillar, checksumRequestsForValidation, blocker,
+                auditTrailInformation);
         OperationEvent finishEvent = blocker.awaitFinished();
-        if(finishEvent.getEventType() == OperationEvent.OperationEventType.COMPLETE) {
+        if (finishEvent.getEventType() == OperationEvent.OperationEventType.COMPLETE) {
             return blocker.getResults();
         } else if (finishEvent.getEventType() == OperationEvent.OperationEventType.FAILED) {
             throw new OperationFailedException(finishEvent.getInfo());
diff --git a/bitrepository-client/src/main/java/org/bitrepository/modify/deletefile/ConversationBasedDeleteFileClient.java b/bitrepository-client/src/main/java/org/bitrepository/modify/deletefile/ConversationBasedDeleteFileClient.java
index 4af6a4222..2274cd653 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/modify/deletefile/ConversationBasedDeleteFileClient.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/modify/deletefile/ConversationBasedDeleteFileClient.java
@@ -1,30 +1,29 @@
 /*
  * #%L
  * Bitrepository Modifying Client
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.modify.deletefile;
 
-import java.util.Arrays;
 import org.bitrepository.bitrepositoryelements.ChecksumDataForFileTYPE;
 import org.bitrepository.bitrepositoryelements.ChecksumSpecTYPE;
 import org.bitrepository.client.AbstractClient;
@@ -39,42 +38,44 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.List;
+
 public class ConversationBasedDeleteFileClient extends AbstractClient implements DeleteFileClient {
     private final Logger log = LoggerFactory.getLogger(this.getClass());
 
     /**
-     * @see AbstractClient
-     * @param messageBus The {@link MessageBus} used for communication
+     * @param messageBus           The {@link MessageBus} used for communication
      * @param conversationMediator The {@link ConversationMediator} for keeping track of conversations
-     * @param settings The {@link Settings} for the client
-     * @param clientID The ID of the client
+     * @param settings             The {@link Settings} for the client
+     * @param clientID             The ID of the client
+     * @see AbstractClient
      */
-    public ConversationBasedDeleteFileClient(MessageBus messageBus, ConversationMediator conversationMediator, 
-            Settings settings, String clientID) {
+    public ConversationBasedDeleteFileClient(MessageBus messageBus, ConversationMediator conversationMediator,
+                                             Settings settings, String clientID) {
         super(settings, conversationMediator, messageBus, clientID);
     }
-    
+
     @Override
     public void deleteFile(String collectionID, String fileID, String pillarID,
                            ChecksumDataForFileTYPE checksumForPillar,
-            ChecksumSpecTYPE checksumRequested, EventHandler eventHandler, String auditTrailInformation) {
+                           ChecksumSpecTYPE checksumRequested, EventHandler eventHandler, String auditTrailInformation) {
         ArgumentValidator.checkNotNullOrEmpty(collectionID, "collectionID");
         ArgumentValidator.checkNotNullOrEmpty(fileID, "fileID");
         ArgumentValidator.checkNotNullOrEmpty(pillarID, "pillarID");
         MessageDataTypeValidator.validate(checksumForPillar, "checksumForPillar");
         MessageDataTypeValidator.validate(checksumRequested, "checksumRequested");
         validateFileID(fileID);
-        if(settings.getRepositorySettings().getProtocolSettings().isRequireChecksumForDestructiveRequests()) {
+        if (settings.getRepositorySettings().getProtocolSettings().isRequireChecksumForDestructiveRequests()) {
             ArgumentValidator.checkNotNull(checksumForPillar, "ChecksumForPillar");
         }
-        
+
         log.info("Requesting the deletion of the file '" + fileID + "' from the pillar '" + pillarID
-                + "' with checksum '" + checksumForPillar + "', while requested checksum '" + checksumRequested 
+                + "' with checksum '" + checksumForPillar + "', while requested checksum '" + checksumRequested
                 + "'. And the audit trail information '" + auditTrailInformation + "'.");
-        
+
         DeleteFileConversationContext context = new DeleteFileConversationContext(collectionID, fileID,
                 checksumForPillar, checksumRequested, settings, messageBus, clientID,
-                Arrays.asList(pillarID), eventHandler, auditTrailInformation);
+                List.of(pillarID), eventHandler, auditTrailInformation);
         startConversation(context, new IdentifyPillarsForDeleteFile(context));
     }
 }
diff --git a/bitrepository-client/src/main/java/org/bitrepository/modify/deletefile/DeleteFileClient.java b/bitrepository-client/src/main/java/org/bitrepository/modify/deletefile/DeleteFileClient.java
index 9ed87944b..3cce64fe3 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/modify/deletefile/DeleteFileClient.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/modify/deletefile/DeleteFileClient.java
@@ -1,23 +1,23 @@
 /*
  * #%L
  * Bitmagasin modify client
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -26,28 +26,27 @@
 
 import org.bitrepository.bitrepositoryelements.ChecksumDataForFileTYPE;
 import org.bitrepository.bitrepositoryelements.ChecksumSpecTYPE;
-import org.bitrepository.client.BitrepositoryClient;
+import org.bitrepository.client.BitRepositoryClient;
 import org.bitrepository.client.eventhandler.EventHandler;
 
-/**
- * Interface for the delete client.
- */
-public interface DeleteFileClient extends BitrepositoryClient {
+public interface DeleteFileClient extends BitRepositoryClient {
     /**
      * Starts the conversation for deleting a file on a given pillar.
      * Takes checksum and checksum specification as argument to validate the file to delete.
-     * @param collectionID The colelction to delete the file in.
-     * @param fileID The id of the file to delete.
-     * @param pillarID The id of the pillar, where the file should be deleted.
-     * @param checksumForPillar The specifications for the checksum of the file.
-     * @param checksumRequested Checksum request for the pillar where the file is deleted
-     * @param eventHandler [OPTIONAL] The handler which should receive notifications of the events occurring in 
-     * connection with the pillar communication. This is allowed to be null.
-     * In a good case scenario this will give the events: <p> 
-     * IdentifyPillarsRequestSent, PillarIdentified, PillarSelected, RequestSent, Progress, PillarComplete, Complete
-     * @param auditTrailInformation The audit information for the given operation. E.g. who is behind the operation 
-     * call.
+     *
+     * @param collectionID          The collection to delete the file in.
+     * @param fileID                The id of the file to delete.
+     * @param pillarID              The id of the pillar, where the file should be deleted.
+     * @param checksumForPillar     The specifications for the checksum of the file.
+     * @param checksumRequested     Checksum request for the pillar where the file is deleted
+     * @param eventHandler          [OPTIONAL] The handler which should receive notifications of the events occurring in
+     *                              connection with the pillar communication. This is allowed to be null.
+     *                              In a good case scenario this will give the events: <p>
+     *                              IdentifyPillarsRequestSent, PillarIdentified, PillarSelected, RequestSent, Progress, PillarComplete,
+     *                              Complete
+     * @param auditTrailInformation The audit information for the given operation. E.g. who is behind the operation
+     *                              call.
      */
     void deleteFile(String collectionID, String fileID, String pillarID, ChecksumDataForFileTYPE checksumForPillar,
-            ChecksumSpecTYPE checksumRequested, EventHandler eventHandler, String auditTrailInformation);
+                    ChecksumSpecTYPE checksumRequested, EventHandler eventHandler, String auditTrailInformation);
 }
diff --git a/bitrepository-client/src/main/java/org/bitrepository/modify/deletefile/conversation/DeleteFileCompletePillarEvent.java b/bitrepository-client/src/main/java/org/bitrepository/modify/deletefile/conversation/DeleteFileCompletePillarEvent.java
index 2d15a5512..c7fd50c82 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/modify/deletefile/conversation/DeleteFileCompletePillarEvent.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/modify/deletefile/conversation/DeleteFileCompletePillarEvent.java
@@ -1,23 +1,24 @@
 /*
  * #%L
- * Bitrepository Access
- * 
+ * BitRepository Access
+ *
  * $Id: ChecksumsCompletePillarEvent.java 548 2011-11-21 16:43:43Z jolf $
- * $HeadURL: https://sbforge.org/svn/bitrepository/bitrepository-reference/trunk/bitrepository-access-client/src/main/java/org/bitrepository/access/getchecksums/conversation/ChecksumsCompletePillarEvent.java $
+ * $HeadURL: https://sbforge.org/svn/bitrepository/bitrepository-reference/trunk/bitrepository-access-client/src/main/java/org
+ * /bitrepository/access/getchecksums/conversation/ChecksumsCompletePillarEvent.java $
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -28,29 +29,31 @@
 import org.bitrepository.client.eventhandler.ContributorCompleteEvent;
 
 /**
-* Contains the result of a delete request sent to a single pillar.
-*/
+ * Contains the result of a delete request sent to a single pillar.
+ */
 public class DeleteFileCompletePillarEvent extends ContributorCompleteEvent {
-    /** @see #getChecksums(). */
+    /**
+     * @see #getChecksums().
+     */
     private final ChecksumDataForFileTYPE result;
-    
+
     /**
-     * @param pillarID The pillar which generated the result
+     * @param pillarID     The pillar which generated the result
      * @param collectionID The ID of the collection
-     * @param result The result returned by the pillar.
+     * @param result       The result returned by the pillar.
      */
     public DeleteFileCompletePillarEvent(String pillarID, String collectionID, ChecksumDataForFileTYPE result) {
         super(pillarID, collectionID);
         this.result = result;
     }
 
-    /** 
-     * @return The checksum result from a single pillar. 
+    /**
+     * @return The checksum result from a single pillar.
      */
     public ChecksumDataForFileTYPE getChecksums() {
         return result;
     }
-    
+
     @Override
     public String additionalInfo() {
         return super.additionalInfo() + ", DeleteFileResult=" + result;
diff --git a/bitrepository-client/src/main/java/org/bitrepository/modify/deletefile/conversation/DeleteFileConversationContext.java b/bitrepository-client/src/main/java/org/bitrepository/modify/deletefile/conversation/DeleteFileConversationContext.java
index f113c2cc0..e95c070a6 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/modify/deletefile/conversation/DeleteFileConversationContext.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/modify/deletefile/conversation/DeleteFileConversationContext.java
@@ -5,23 +5,22 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.modify.deletefile.conversation;
 
-import java.util.Collection;
 import org.bitrepository.bitrepositoryelements.ChecksumDataForFileTYPE;
 import org.bitrepository.bitrepositoryelements.ChecksumSpecTYPE;
 import org.bitrepository.client.conversation.ConversationContext;
@@ -30,23 +29,26 @@
 import org.bitrepository.protocol.OperationType;
 import org.bitrepository.protocol.messagebus.MessageSender;
 
+import java.util.Collection;
+
 public class DeleteFileConversationContext extends ConversationContext {
     private final ChecksumDataForFileTYPE checksumForValidationAtPillar;
     private final ChecksumSpecTYPE checksumRequestsForValidation;
-    
+
     public DeleteFileConversationContext(
             String collectionID, String fileID, ChecksumDataForFileTYPE checksumForValidationAtPillar,
             ChecksumSpecTYPE checksumRequestsForValidation, Settings settings, MessageSender messageSender,
-            String clientID,  Collection<String> contributors, EventHandler eventHandler, String auditTrailInformation) {
-        super(collectionID, OperationType.DELETE_FILE, settings, messageSender, clientID, fileID, contributors, eventHandler, auditTrailInformation);
+            String clientID, Collection<String> contributors, EventHandler eventHandler, String auditTrailInformation) {
+        super(collectionID, OperationType.DELETE_FILE, settings, messageSender, clientID, fileID, contributors, eventHandler,
+                auditTrailInformation);
         this.checksumForValidationAtPillar = checksumForValidationAtPillar;
         this.checksumRequestsForValidation = checksumRequestsForValidation;
     }
-    
+
     public ChecksumDataForFileTYPE getChecksumForValidationAtPillar() {
         return checksumForValidationAtPillar;
     }
-    
+
     public ChecksumSpecTYPE getChecksumRequestForValidation() {
         return checksumRequestsForValidation;
     }
diff --git a/bitrepository-client/src/main/java/org/bitrepository/modify/deletefile/conversation/DeletingFile.java b/bitrepository-client/src/main/java/org/bitrepository/modify/deletefile/conversation/DeletingFile.java
index f50298867..f17969180 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/modify/deletefile/conversation/DeletingFile.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/modify/deletefile/conversation/DeletingFile.java
@@ -1,52 +1,52 @@
 /*
  * #%L
  * Bitrepository Modifying Client
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.modify.deletefile.conversation;
 
-import java.util.Collection;
 import org.bitrepository.bitrepositorymessages.DeleteFileFinalResponse;
 import org.bitrepository.bitrepositorymessages.DeleteFileRequest;
 import org.bitrepository.bitrepositorymessages.MessageResponse;
 import org.bitrepository.client.conversation.ConversationContext;
 import org.bitrepository.client.conversation.PerformingOperationState;
 import org.bitrepository.client.conversation.selector.SelectedComponentInfo;
-import org.bitrepository.client.exceptions.UnexpectedResponseException;
 import org.bitrepository.common.utils.ChecksumUtils;
 
+import java.util.Collection;
+
 /**
  * Models the behavior of a DeleteFile conversation during the operation phase. That is, it begins with the sending of
  * <code>DeleteFileRequest</code> messages and finishes with the reception of the <code>DeleteFileFinalResponse</code>
- * messages from all responding pillars. 
- *
- * Note that this is only used by the DeleteFileConversation in the same package, therefore the visibility is package 
+ * messages from all responding pillars.
+ * <p>
+ * Note that this is only used by the DeleteFileConversation in the same package, therefore the visibility is package
  * protected.
  */
 public class DeletingFile extends PerformingOperationState {
     private final DeleteFileConversationContext context;
 
-    /*
-     * @param context The conversation context.
+    /**
+     * @param context      The conversation context.
      * @param contributors The list of components the fileIDs should be collected from.
      */
     public DeletingFile(DeleteFileConversationContext context, Collection<SelectedComponentInfo> contributors) {
@@ -55,7 +55,7 @@ public DeletingFile(DeleteFileConversationContext context, Collection<SelectedCo
     }
 
     @Override
-    protected void generateContributorCompleteEvent(MessageResponse msg) throws UnexpectedResponseException {
+    protected void generateContributorCompleteEvent(MessageResponse msg) {
         DeleteFileFinalResponse response = (DeleteFileFinalResponse) msg;
         getContext().getMonitor().contributorComplete(new DeleteFileCompletePillarEvent(
                 response.getPillarID(), response.getCollectionID(), response.getChecksumDataForExistingFile()));
@@ -64,7 +64,7 @@ protected void generateContributorCompleteEvent(MessageResponse msg) throws Unex
     @Override
     protected void sendRequest() {
         context.getMonitor().requestSent("Sending request for deleting file", activeContributors.keySet().toString());
-        for(String pillarID : activeContributors.keySet()) {
+        for (String pillarID : activeContributors.keySet()) {
             DeleteFileRequest msg = createRequest(pillarID);
             if (context.getChecksumRequestForValidation() != null) {
                 if (!context.isChecksumPillar(pillarID) ||
@@ -82,7 +82,6 @@ protected void sendRequest() {
      * @param pillarID the ID of the pillar
      * @return a newly created PutFileRequest based on the context. The ChecksumRequestForNewFile parameter is not added as this
      * should only be added in case of full pillars.
-     *
      */
     private DeleteFileRequest createRequest(String pillarID) {
         DeleteFileRequest request = new DeleteFileRequest();
@@ -94,7 +93,6 @@ private DeleteFileRequest createRequest(String pillarID) {
         return request;
     }
 
-
     @Override
     protected ConversationContext getContext() {
         return context;
diff --git a/bitrepository-client/src/main/java/org/bitrepository/modify/deletefile/conversation/IdentifyPillarsForDeleteFile.java b/bitrepository-client/src/main/java/org/bitrepository/modify/deletefile/conversation/IdentifyPillarsForDeleteFile.java
index e44789276..8838d59fd 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/modify/deletefile/conversation/IdentifyPillarsForDeleteFile.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/modify/deletefile/conversation/IdentifyPillarsForDeleteFile.java
@@ -1,23 +1,23 @@
 /*
  * #%L
  * Bitrepository Access
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -50,26 +50,25 @@ public GeneralConversationState getOperationState() {
     }
 
     /**
-     * Extends the default behaviour with a idempotent aspects. This assumes that the delete on a pillar is successful if
-     * if the file is already absent.
-     *
+     * Extends the default behaviour with an idempotent aspects. This assumes that the <cod>delete</cod> operation on a pillar is
+     * successful if the file is already absent.
+     * <p/>
      * Any other none-positive response is handled as a fatal problem.
      */
     @Override
     protected void handleFailureResponse(MessageResponse msg) throws UnableToFinishException {
         IdentifyPillarsForDeleteFileResponse response = (IdentifyPillarsForDeleteFileResponse) msg;
         ResponseCode responseCode = response.getResponseInfo().getResponseCode();
-        if(responseCode.equals(ResponseCode.FILE_NOT_FOUND_FAILURE)) {
+        if (responseCode.equals(ResponseCode.FILE_NOT_FOUND_FAILURE)) {
             //Idempotent
             getContext().getMonitor().contributorIdentified(response);
-            getContext().getMonitor().contributorComplete(new DeleteFileCompletePillarEvent(
-                    response.getFrom(), response.getCollectionID(), null ));
+            getContext().getMonitor()
+                    .contributorComplete(new DeleteFileCompletePillarEvent(response.getFrom(), response.getCollectionID(), null));
         } else {
-            getContext().getMonitor().contributorFailed(
-                    msg.getResponseInfo().getResponseText(), msg.getFrom(), 
-                    msg.getResponseInfo().getResponseCode());
-            throw new UnableToFinishException("Can not continue with delete operation, as " + msg.getFrom() +
-                    " is unable to perform the deletion.");
+            getContext().getMonitor()
+                    .contributorFailed(msg.getResponseInfo().getResponseText(), msg.getFrom(), msg.getResponseInfo().getResponseCode());
+            throw new UnableToFinishException(
+                    "Can not continue with delete operation, as " + msg.getFrom() + " is unable to perform the deletion.");
         }
     }
 
diff --git a/bitrepository-client/src/main/java/org/bitrepository/modify/package-info.java b/bitrepository-client/src/main/java/org/bitrepository/modify/package-info.java
index 5d010b74e..9a003d01f 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/modify/package-info.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/modify/package-info.java
@@ -1,30 +1,30 @@
 /*
  * #%L
- * Bitrepository Modifying Client
- * 
+ * BitRepository Modifying Client
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 /**
- * All functionality for writing to the Bitrepository is located here. 
- * 
+ * All functionality for writing to the Bitrepository is located here.
+ * <p>
  * This includes Put File, Delete File and Replace File.
  */
 package org.bitrepository.modify;
\ No newline at end of file
diff --git a/bitrepository-client/src/main/java/org/bitrepository/modify/putfile/BlockingPutFileClient.java b/bitrepository-client/src/main/java/org/bitrepository/modify/putfile/BlockingPutFileClient.java
index d1f13d508..46549d9f4 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/modify/putfile/BlockingPutFileClient.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/modify/putfile/BlockingPutFileClient.java
@@ -1,31 +1,29 @@
 /*
  * #%L
  * Bitmagasin modify client
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.modify.putfile;
 
-import java.net.URL;
-import java.util.List;
 import org.bitrepository.bitrepositoryelements.ChecksumDataForFileTYPE;
 import org.bitrepository.bitrepositoryelements.ChecksumSpecTYPE;
 import org.bitrepository.client.eventhandler.BlockingEventHandler;
@@ -34,8 +32,11 @@
 import org.bitrepository.client.eventhandler.OperationEvent;
 import org.bitrepository.common.exceptions.OperationFailedException;
 
+import java.net.URL;
+import java.util.List;
+
 /**
- * Wrappes a <code>PutFileClient</code> to provide a blocking client. The client will block until the PutFileOperation
+ * Wraps a <code>PutFileClient</code> to provide a blocking client. The client will block until the PutFileOperation
  * has finished.
  */
 public class BlockingPutFileClient {
@@ -44,20 +45,21 @@ public class BlockingPutFileClient {
     public BlockingPutFileClient(PutFileClient client) {
         this.client = client;
     }
+
     /**
      * Method for performing a blocking put file operation. Wraps the asynchronous {@link PutFileClient#putFile
      * (String, java.net.URL, String, long, org.bitrepository.bitrepositoryelements.ChecksumDataForFileTYPE,
      * org.bitrepository.bitrepositoryelements.ChecksumSpecTYPE, org.bitrepository.client.eventhandler.EventHandler,
      * String)} method.
      *
-     * @param collectionID The ID of the collection
-     * @param url The url to where the file being put can be retrieved 
-     * @param fileID The ID of the file
-     * @param sizeOfFile [OPTIONAL] the size of the file
+     * @param collectionID                  The ID of the collection
+     * @param url                           The url to where the file being put can be retrieved
+     * @param fileID                        The ID of the file
+     * @param sizeOfFile                    [OPTIONAL] the size of the file
      * @param checksumForValidationAtPillar The checksum data of the file for pillar side validation
      * @param checksumRequestsForValidation The checksum request for the pillar to deliver
-     * @param eventHandler The {@link EventHandler} to handle incoming events 
-     * @param auditTrailInformation The audittrail information for the pillars
+     * @param eventHandler                  The {@link EventHandler} to handle incoming events
+     * @param auditTrailInformation         The auditTrail information for the pillars
      * @return The list of {@link ContributorEvent}s received during the operation
      * @throws OperationFailedException The operation didn't complete successfully.
      */
@@ -76,7 +78,7 @@ public List<ContributorEvent> putFile(
                 checksumRequestsForValidation,
                 blocker, auditTrailInformation);
         OperationEvent finishEvent = blocker.awaitFinished();
-        if(finishEvent.getEventType() == OperationEvent.OperationEventType.COMPLETE) {
+        if (finishEvent.getEventType() == OperationEvent.OperationEventType.COMPLETE) {
             return blocker.getResults();
         } else if (finishEvent.getEventType() == OperationEvent.OperationEventType.FAILED) {
             throw new OperationFailedException(finishEvent.getInfo());
diff --git a/bitrepository-client/src/main/java/org/bitrepository/modify/putfile/ConversationBasedPutFileClient.java b/bitrepository-client/src/main/java/org/bitrepository/modify/putfile/ConversationBasedPutFileClient.java
index 942a3b7bd..cd1b6050f 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/modify/putfile/ConversationBasedPutFileClient.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/modify/putfile/ConversationBasedPutFileClient.java
@@ -8,16 +8,16 @@
  * Copyright (C) 2010 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -41,28 +41,24 @@
 
 import java.net.URL;
 
-/**
- * A simple implementation of the PutClient.
- */
 public class ConversationBasedPutFileClient extends AbstractClient implements PutFileClient {
     private final Logger log = LoggerFactory.getLogger(getClass());
 
     /**
-     * @see AbstractClient
-     * @param messageBus The {@link MessageBus} for handling communication
+     * @param messageBus           The {@link MessageBus} for handling communication
      * @param conversationMediator The {@link ConversationMediator} for keeping track of conversations
-     * @param settings The {@link Settings} for the client
-     * @param clientID The ID of the client
+     * @param settings             The {@link Settings} for the client
+     * @param clientID             The ID of the client
+     * @see AbstractClient
      */
-    public ConversationBasedPutFileClient(MessageBus messageBus, ConversationMediator conversationMediator, 
-            Settings settings, String clientID) {
+    public ConversationBasedPutFileClient(MessageBus messageBus, ConversationMediator conversationMediator, Settings settings,
+                                          String clientID) {
         super(settings, conversationMediator, messageBus, clientID);
     }
-    
+
     @Override
-    public void putFile(String collectionID, URL url, String fileID, long sizeOfFile,
-                        ChecksumDataForFileTYPE checksumForValidationAtPillar,
-            ChecksumSpecTYPE checksumRequestsForValidation, EventHandler eventHandler, String auditTrailInformation) {
+    public void putFile(String collectionID, URL url, String fileID, long sizeOfFile, ChecksumDataForFileTYPE checksumForValidationAtPillar,
+                        ChecksumSpecTYPE checksumRequestsForValidation, EventHandler eventHandler, String auditTrailInformation) {
         ArgumentValidator.checkNotNullOrEmpty(collectionID, "collectionID");
         ArgumentValidator.checkNotNullOrEmpty(fileID, "fileID");
         validateFileID(fileID);
@@ -72,13 +68,13 @@ public void putFile(String collectionID, URL url, String fileID, long sizeOfFile
         MessageDataTypeValidator.validate(checksumRequestsForValidation, "checksumRequestsForValidation");
 
         log.info("Starting putFile of " + fileID + " for client " + clientID + ". " + auditTrailInformation);
-        if(settings.getRepositorySettings().getProtocolSettings().isRequireChecksumForNewFileRequests()) {
+        if (settings.getRepositorySettings().getProtocolSettings().isRequireChecksumForNewFileRequests()) {
             ArgumentValidator.checkNotNull(checksumForValidationAtPillar, "ChecksumDataForFileTYPE checksumForValidationAtPillar");
         }
-        
+
         PutFileConversationContext context = new PutFileConversationContext(collectionID, fileID, url, sizeOfFile,
-                checksumForValidationAtPillar, checksumRequestsForValidation, settings, messageBus,
-                clientID, SettingsUtils.getPillarIDsForCollection(collectionID), eventHandler, auditTrailInformation);
+                checksumForValidationAtPillar, checksumRequestsForValidation, settings, messageBus, clientID,
+                SettingsUtils.getPillarIDsForCollection(collectionID), eventHandler, auditTrailInformation);
         startConversation(context, new IdentifyPillarsForPutFile(context));
     }
 }
diff --git a/bitrepository-client/src/main/java/org/bitrepository/modify/putfile/PutFileClient.java b/bitrepository-client/src/main/java/org/bitrepository/modify/putfile/PutFileClient.java
index 04503ebf9..e6593d2a3 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/modify/putfile/PutFileClient.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/modify/putfile/PutFileClient.java
@@ -24,17 +24,17 @@
  */
 package org.bitrepository.modify.putfile;
 
-import java.net.URL;
-
 import org.bitrepository.bitrepositoryelements.ChecksumDataForFileTYPE;
 import org.bitrepository.bitrepositoryelements.ChecksumSpecTYPE;
-import org.bitrepository.client.BitrepositoryClient;
+import org.bitrepository.client.BitRepositoryClient;
 import org.bitrepository.client.eventhandler.EventHandler;
 
+import java.net.URL;
+
 /**
  * Interface for the put client.
  */
-public interface PutFileClient extends BitrepositoryClient {
+public interface PutFileClient extends BitRepositoryClient {
     /**
      * Places a copy of the file located at the given url on each of the pillars defined for the indicated collection.
      *
diff --git a/bitrepository-client/src/main/java/org/bitrepository/modify/putfile/conversation/IdentifyPillarsForPutFile.java b/bitrepository-client/src/main/java/org/bitrepository/modify/putfile/conversation/IdentifyPillarsForPutFile.java
index 7ab93f484..df9970324 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/modify/putfile/conversation/IdentifyPillarsForPutFile.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/modify/putfile/conversation/IdentifyPillarsForPutFile.java
@@ -1,23 +1,23 @@
 /*
  * #%L
  * Bitrepository Access
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -51,41 +51,39 @@ public IdentifyPillarsForPutFile(PutFileConversationContext context) {
     /**
      * Extends the default behaviour with an idempotent aspect. This assumes that the put to a pillar is successful if
      * the same file already exists.
-     *
+     * <p>
      * The existence of a different file on the other hand is a fatal problem.
      */
     @Override
     protected void handleFailureResponse(MessageResponse msg) throws UnableToFinishException {
         IdentifyPillarsForPutFileResponse response = (IdentifyPillarsForPutFileResponse) msg;
         ResponseCode responseCode = response.getResponseInfo().getResponseCode();
-        switch (responseCode) {
-            case DUPLICATE_FILE_FAILURE:
-                if(response.isSetChecksumDataForExistingFile()) {
-                    if(ChecksumUtils.areEqual(
-                            response.getChecksumDataForExistingFile(),context.getChecksumForValidationAtPillar())) {
-                        PutFileCompletePillarEvent event = new PutFileCompletePillarEvent(
-                                response.getPillarID(), response.getCollectionID(), response.getChecksumDataForExistingFile());
-                        event.setInfo("File already existed on " + response.getPillarID());
-                        getContext().getMonitor().contributorComplete(event);
-                    } else {
-                        getContext().getMonitor().contributorFailed(
-                                "Received negative response from component " + response.getFrom() +
-                                        ":  " + response.getResponseInfo() + " (existing file checksum does not match)",
-                                response.getFrom(), response.getResponseInfo().getResponseCode());
-                        throw new UnableToFinishException("Can not put file " + context.getFileID() +
-                                ", as an different file already exists on pillar " + response.getPillarID());
-                    }
+        if (responseCode == ResponseCode.DUPLICATE_FILE_FAILURE) {
+            if (response.isSetChecksumDataForExistingFile()) {
+                if (ChecksumUtils.areEqual(
+                        response.getChecksumDataForExistingFile(), context.getChecksumForValidationAtPillar())) {
+                    PutFileCompletePillarEvent event = new PutFileCompletePillarEvent(
+                            response.getPillarID(), response.getCollectionID(), response.getChecksumDataForExistingFile());
+                    event.setInfo("File already existed on " + response.getPillarID());
+                    getContext().getMonitor().contributorComplete(event);
                 } else {
                     getContext().getMonitor().contributorFailed(
-                            "Received negative response from component " + response.getFrom() + ":  " +
-                                    response.getResponseInfo(), response.getFrom(), 
-                                    response.getResponseInfo().getResponseCode());
+                            "Received negative response from component " + response.getFrom() +
+                                    ":  " + response.getResponseInfo() + " (existing file checksum does not match)",
+                            response.getFrom(), response.getResponseInfo().getResponseCode());
                     throw new UnableToFinishException("Can not put file " + context.getFileID() +
-                            ", as an file already exists on pillar " + response.getPillarID());
+                            ", as an different file already exists on pillar " + response.getPillarID());
                 }
-                break;
-            default:
-                super.handleFailureResponse(msg);
+            } else {
+                getContext().getMonitor().contributorFailed(
+                        "Received negative response from component " + response.getFrom() + ":  " +
+                                response.getResponseInfo(), response.getFrom(),
+                        response.getResponseInfo().getResponseCode());
+                throw new UnableToFinishException("Can not put file " + context.getFileID() +
+                        ", as an file already exists on pillar " + response.getPillarID());
+            }
+        } else {
+            super.handleFailureResponse(msg);
         }
     }
 
@@ -116,9 +114,9 @@ protected String getPrimitiveName() {
     }
 
     /**
-     * Extends the default behaviour with the possiblity of putting to a subset of pillars, if the
+     * Extends the default behaviour with the possibility of putting to a subset of pillars, if the
      * isSetPartialPutsAllow settings is true.
-     * */
+     */
     @Override
     protected boolean canFinish() {
         return (isPartialPutsAllowed() && getSelector().getSelectedComponents().size() > 0 ||
diff --git a/bitrepository-client/src/main/java/org/bitrepository/modify/putfile/conversation/PutFileCompletePillarEvent.java b/bitrepository-client/src/main/java/org/bitrepository/modify/putfile/conversation/PutFileCompletePillarEvent.java
index 28a183500..53bfad60c 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/modify/putfile/conversation/PutFileCompletePillarEvent.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/modify/putfile/conversation/PutFileCompletePillarEvent.java
@@ -1,23 +1,24 @@
 /*
  * #%L
- * Bitrepository Access
- * 
+ * BitRepository Access
+ *
  * $Id: ChecksumsCompletePillarEvent.java 548 2011-11-21 16:43:43Z jolf $
- * $HeadURL: https://sbforge.org/svn/bitrepository/bitrepository-reference/trunk/bitrepository-access-client/src/main/java/org/bitrepository/access/getchecksums/conversation/ChecksumsCompletePillarEvent.java $
+ * $HeadURL: https://sbforge.org/svn/bitrepository/bitrepository-reference/trunk/bitrepository-access-client/src/main/java/org
+ * /bitrepository/access/getchecksums/conversation/ChecksumsCompletePillarEvent.java $
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -28,29 +29,31 @@
 import org.bitrepository.client.eventhandler.ContributorCompleteEvent;
 
 /**
-* Contains the result of a put file request sent to a single pillar.
-*/
+ * Contains the result of a put file request sent to a single pillar.
+ */
 public class PutFileCompletePillarEvent extends ContributorCompleteEvent {
-    /** @see #getChecksums(). */
+    /**
+     * @see #getChecksums().
+     */
     private final ChecksumDataForFileTYPE result;
-    
+
     /**
-     * @param pillarID The pillar which generated the result
+     * @param pillarID     The pillar which generated the result
      * @param collectionID The ID of the collection
-     * @param result The result returned by the pillar.
+     * @param result       The result returned by the pillar.
      */
     public PutFileCompletePillarEvent(String pillarID, String collectionID, ChecksumDataForFileTYPE result) {
         super(pillarID, collectionID);
         this.result = result;
     }
 
-    /** 
-     * @return The checksum result from a single pillar. 
+    /**
+     * @return The checksum result from a single pillar.
      */
     public ChecksumDataForFileTYPE getChecksums() {
         return result;
     }
-    
+
     @Override
     public String additionalInfo() {
         return super.additionalInfo() + ", requestedChecksumResult=" + result;
diff --git a/bitrepository-client/src/main/java/org/bitrepository/modify/putfile/conversation/PutFileConversationContext.java b/bitrepository-client/src/main/java/org/bitrepository/modify/putfile/conversation/PutFileConversationContext.java
index b278ba7af..10238f29e 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/modify/putfile/conversation/PutFileConversationContext.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/modify/putfile/conversation/PutFileConversationContext.java
@@ -5,25 +5,22 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.modify.putfile.conversation;
 
-import java.math.BigInteger;
-import java.net.URL;
-import java.util.Collection;
 import org.bitrepository.bitrepositoryelements.ChecksumDataForFileTYPE;
 import org.bitrepository.bitrepositoryelements.ChecksumSpecTYPE;
 import org.bitrepository.client.conversation.ConversationContext;
@@ -32,19 +29,23 @@
 import org.bitrepository.protocol.OperationType;
 import org.bitrepository.protocol.messagebus.MessageSender;
 
+import java.math.BigInteger;
+import java.net.URL;
+import java.util.Collection;
+
 public class PutFileConversationContext extends ConversationContext {
     private final URL urlForFile;
     private final BigInteger fileSize;
     private final ChecksumDataForFileTYPE checksumForValidationAtPillar;
     private final ChecksumSpecTYPE checksumRequestsForValidation;
-    
+
     public PutFileConversationContext(String collectionID, String fileID, URL urlForFile, long fileSize,
-            ChecksumDataForFileTYPE checksumForValidationAtPillar, ChecksumSpecTYPE checksumRequestsForValidation, 
-            Settings settings, MessageSender messageSender, String clientID, Collection<String> contributors,
-            EventHandler eventHandler, String auditTrailInformation) {
+                                      ChecksumDataForFileTYPE checksumForValidationAtPillar, ChecksumSpecTYPE checksumRequestsForValidation,
+                                      Settings settings, MessageSender messageSender, String clientID, Collection<String> contributors,
+                                      EventHandler eventHandler, String auditTrailInformation) {
         super(collectionID, OperationType.PUT_FILE, settings, messageSender, clientID, fileID, contributors,
                 eventHandler, auditTrailInformation);
-        this.urlForFile = urlForFile;        
+        this.urlForFile = urlForFile;
         this.fileSize = new BigInteger(Long.toString(fileSize));
         this.checksumForValidationAtPillar = checksumForValidationAtPillar;
         this.checksumRequestsForValidation = checksumRequestsForValidation;
@@ -53,23 +54,17 @@ public PutFileConversationContext(String collectionID, String fileID, URL urlFor
     public URL getUrlForFile() {
         return urlForFile;
     }
-    
+
     public BigInteger getFileSize() {
         return fileSize;
     }
-    
+
     public ChecksumDataForFileTYPE getChecksumForValidationAtPillar() {
         return checksumForValidationAtPillar;
     }
-    
+
     public ChecksumSpecTYPE getChecksumRequestForValidation() {
         return checksumRequestsForValidation;
     }
 
-    /** The checksum for the file being put. Used to verify the file on the pillar when downloaded. 
-     * @return The checksum request for validation 
-     */
-    public ChecksumSpecTYPE getChecksumRequestsForValidation() {
-        return checksumRequestsForValidation;
-    }
 }
diff --git a/bitrepository-client/src/main/java/org/bitrepository/modify/putfile/conversation/PuttingFile.java b/bitrepository-client/src/main/java/org/bitrepository/modify/putfile/conversation/PuttingFile.java
index d166a20d2..80c8742c2 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/modify/putfile/conversation/PuttingFile.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/modify/putfile/conversation/PuttingFile.java
@@ -48,8 +48,8 @@ public class PuttingFile extends PerformingOperationState {
     private final PutFileConversationContext context;
     private final Map<String, Integer> componentRequestCount = new HashMap<>();
 
-    /*
-     * @param context The conversation context.
+    /**
+     * @param context      The conversation context.
      * @param contributors The list of components the fileIDs should be collected from.
      */
     public PuttingFile(PutFileConversationContext context, Collection<SelectedComponentInfo> contributors) {
diff --git a/bitrepository-client/src/main/java/org/bitrepository/modify/replacefile/BlockingReplaceFileClient.java b/bitrepository-client/src/main/java/org/bitrepository/modify/replacefile/BlockingReplaceFileClient.java
index 913ecfeed..7bd07d886 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/modify/replacefile/BlockingReplaceFileClient.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/modify/replacefile/BlockingReplaceFileClient.java
@@ -1,32 +1,29 @@
 /*
  * #%L
  * Bitmagasin modify client
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.modify.replacefile;
 
-import java.net.URL;
-import java.util.List;
-
 import org.bitrepository.bitrepositoryelements.ChecksumDataForFileTYPE;
 import org.bitrepository.bitrepositoryelements.ChecksumSpecTYPE;
 import org.bitrepository.client.eventhandler.BlockingEventHandler;
@@ -35,8 +32,11 @@
 import org.bitrepository.client.eventhandler.OperationEvent;
 import org.bitrepository.common.exceptions.OperationFailedException;
 
+import java.net.URL;
+import java.util.List;
+
 /**
- * Wrappes a <code>ReplaceFileClient</code> to provide a blocking client. The client will block until the ReplaceFileOperation
+ * Wraps a <code>ReplaceFileClient</code> to provide a blocking client. The client will block until the ReplaceFileOperation
  * has finished.
  */
 public class BlockingReplaceFileClient {
@@ -45,30 +45,32 @@ public class BlockingReplaceFileClient {
     public BlockingReplaceFileClient(ReplaceFileClient client) {
         this.client = client;
     }
+
     /**
      * Method for performing a blocking replace file operation. Wraps the asynchronous
      * {@link org.bitrepository.modify.replacefile.ReplaceFileClient#replaceFile
      * (String, String, String, ChecksumDataForFileTYPE, ChecksumSpecTYPE, URL, long, ChecksumDataForFileTYPE,
      * ChecksumSpecTYPE, EventHandler, String)} method.
-     * @param collectionID The ID of the collection
-     * @param fileID The ID of the file
-     * @param pillarID The ID of the pillar
-     * @param checksumForDeleteAtPillar The checksum data for pillar side verification of the existing file
-     * @param checksumRequestedForDeletedFile The checksum request for the existing file
-     * @param url The url of where to find the replacement file
-     * @param sizeOfNewFile The size of the new file [OPTIONAL]
+     *
+     * @param collectionID                         The ID of the collection
+     * @param fileID                               The ID of the file
+     * @param pillarID                             The ID of the pillar
+     * @param checksumForDeleteAtPillar            The checksum data for pillar side verification of the existing file
+     * @param checksumRequestedForDeletedFile      The checksum request for the existing file
+     * @param url                                  The url of where to find the replacement file
+     * @param sizeOfNewFile                        The size of the new file [OPTIONAL]
      * @param checksumForNewFileValidationAtPillar The checksum data for pillar side verification of the new file
-     * @param checksumRequestsForNewFile The checksum request for the new file
-     * @param eventHandler The {@link EventHandler} to handle incoming events
-     * @param auditTrailInformation The audit trail information for the pillar
+     * @param checksumRequestsForNewFile           The checksum request for the new file
+     * @param eventHandler                         The {@link EventHandler} to handle incoming events
+     * @param auditTrailInformation                The audit trail information for the pillar
      * @return The list of received {@link ContributorEvent}'s
      * @throws OperationFailedException The operation didn't complete successfully.
      */
     public List<ContributorEvent> replaceFile(
             String collectionID, String fileID, String pillarID, ChecksumDataForFileTYPE checksumForDeleteAtPillar,
-    ChecksumSpecTYPE checksumRequestedForDeletedFile, URL url, long sizeOfNewFile,
-    ChecksumDataForFileTYPE checksumForNewFileValidationAtPillar, ChecksumSpecTYPE checksumRequestsForNewFile,
-    EventHandler eventHandler, String auditTrailInformation)
+            ChecksumSpecTYPE checksumRequestedForDeletedFile, URL url, long sizeOfNewFile,
+            ChecksumDataForFileTYPE checksumForNewFileValidationAtPillar, ChecksumSpecTYPE checksumRequestsForNewFile,
+            EventHandler eventHandler, String auditTrailInformation)
             throws OperationFailedException {
         BlockingEventHandler blocker = new BlockingEventHandler(eventHandler);
         client.replaceFile(collectionID, fileID, pillarID, checksumForDeleteAtPillar,
@@ -76,7 +78,7 @@ public List<ContributorEvent> replaceFile(
                 checksumRequestsForNewFile,
                 blocker, auditTrailInformation);
         OperationEvent finishEvent = blocker.awaitFinished();
-        if(finishEvent.getEventType() == OperationEvent.OperationEventType.COMPLETE) {
+        if (finishEvent.getEventType() == OperationEvent.OperationEventType.COMPLETE) {
             return blocker.getResults();
         } else if (finishEvent.getEventType() == OperationEvent.OperationEventType.FAILED) {
             throw new OperationFailedException(finishEvent.getInfo());
diff --git a/bitrepository-client/src/main/java/org/bitrepository/modify/replacefile/ConversationBasedReplaceFileClient.java b/bitrepository-client/src/main/java/org/bitrepository/modify/replacefile/ConversationBasedReplaceFileClient.java
index 2b5678c4e..c70f02630 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/modify/replacefile/ConversationBasedReplaceFileClient.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/modify/replacefile/ConversationBasedReplaceFileClient.java
@@ -1,31 +1,30 @@
 /*
  * #%L
  * Bitrepository Modifying Client
- * 
+ *
  * $Id: ConversationBasedDeleteFileClient.java 639 2011-12-15 10:24:45Z jolf $
- * $HeadURL: https://sbforge.org/svn/bitrepository/bitrepository-reference/trunk/bitrepository-modifying-client/src/main/java/org/bitrepository/modify/deletefile/ConversationBasedDeleteFileClient.java $
+ * $HeadURL: https://sbforge.org/svn/bitrepository/bitrepository-reference/trunk/bitrepository-modifying-client/src/main/java/org
+ * /bitrepository/modify/deletefile/ConversationBasedDeleteFileClient.java $
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.modify.replacefile;
 
-import java.net.URL;
-import java.util.Arrays;
 import org.bitrepository.bitrepositoryelements.ChecksumDataForFileTYPE;
 import org.bitrepository.bitrepositoryelements.ChecksumSpecTYPE;
 import org.bitrepository.client.AbstractClient;
@@ -40,6 +39,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.net.URL;
+import java.util.List;
+
 /**
  * A conversation based implementation of the ReplaceFileClient.
  */
@@ -47,49 +49,49 @@ public class ConversationBasedReplaceFileClient extends AbstractClient implement
     private final Logger log = LoggerFactory.getLogger(this.getClass());
 
     /**
-     * @see AbstractClient
-     * @param messageBus The {@link MessageBus} used for communication
+     * @param messageBus           The {@link MessageBus} used for communication
      * @param conversationMediator The {@link ConversationMediator} for keeping track of conversations
-     * @param settings The {@link Settings} for the client
-     * @param clientID The ID of the client
+     * @param settings             The {@link Settings} for the client
+     * @param clientID             The ID of the client
+     * @see AbstractClient
      */
-    public ConversationBasedReplaceFileClient(MessageBus messageBus, ConversationMediator conversationMediator, 
-            Settings settings, String clientID) {
+    public ConversationBasedReplaceFileClient(MessageBus messageBus, ConversationMediator conversationMediator,
+                                              Settings settings, String clientID) {
         super(settings, conversationMediator, messageBus, clientID);
     }
-    
+
     @Override
     public void replaceFile(String collectionID, String fileID, String pillarID, ChecksumDataForFileTYPE checksumForDeleteAtPillar,
-            ChecksumSpecTYPE checksumRequestedForDeletedFile, URL url, long sizeOfNewFile, 
-            ChecksumDataForFileTYPE checksumForNewFileValidationAtPillar, ChecksumSpecTYPE checksumRequestsForNewFile, 
-            EventHandler eventHandler, String auditTrailInformation) {
+                            ChecksumSpecTYPE checksumRequestedForDeletedFile, URL url, long sizeOfNewFile,
+                            ChecksumDataForFileTYPE checksumForNewFileValidationAtPillar, ChecksumSpecTYPE checksumRequestsForNewFile,
+                            EventHandler eventHandler, String auditTrailInformation) {
         ArgumentValidator.checkNotNullOrEmpty(collectionID, "collectionID");
         ArgumentValidator.checkNotNullOrEmpty(fileID, "fileID");
         validateFileID(fileID);
         ArgumentValidator.checkNotNullOrEmpty(fileID, "String fileID");
         ArgumentValidator.checkNotNullOrEmpty(pillarID, "String pillarID");
-        if(settings.getRepositorySettings().getProtocolSettings().isRequireChecksumForDestructiveRequests()) {
+        if (settings.getRepositorySettings().getProtocolSettings().isRequireChecksumForDestructiveRequests()) {
             ArgumentValidator.checkNotNull(checksumForDeleteAtPillar, "ChecksumDataForFileTYPE checksumForDeleteAtPillar");
             MessageDataTypeValidator.validate(checksumForDeleteAtPillar, "checksumForDeleteAtPillar");
         }
-        if(settings.getRepositorySettings().getProtocolSettings().isRequireChecksumForNewFileRequests()) {
+        if (settings.getRepositorySettings().getProtocolSettings().isRequireChecksumForNewFileRequests()) {
             ArgumentValidator.checkNotNull(checksumForNewFileValidationAtPillar,
                     "ChecksumDataForFileTYPE checksumForNewFileValidationAtPillar");
             MessageDataTypeValidator.validate(checksumForNewFileValidationAtPillar, "checksumForNewFileValidationAtPillar");
         }
         MessageDataTypeValidator.validate(checksumRequestedForDeletedFile, "checksumRequestedForDeletedFile");
         MessageDataTypeValidator.validate(checksumRequestsForNewFile, "checksumRequestsForNewFile");
-        
+
         log.info("Requesting the replacement of the file '" + fileID + "' at the pillar '" + pillarID + "' from the "
-                + "URL '" + url + "' and with the size '" + sizeOfNewFile + "', where the old file has the checksum '" 
-                + checksumForDeleteAtPillar + "' and is requested the checksum '" + checksumRequestedForDeletedFile 
+                + "URL '" + url + "' and with the size '" + sizeOfNewFile + "', where the old file has the checksum '"
+                + checksumForDeleteAtPillar + "' and is requested the checksum '" + checksumRequestedForDeletedFile
                 + "', and the new file has the checksum '" + checksumForNewFileValidationAtPillar + "' and requesting "
-                + "the checksum '" + checksumRequestsForNewFile + "'. With the audittrail '" + auditTrailInformation 
+                + "the checksum '" + checksumRequestsForNewFile + "'. With the auditTrail '" + auditTrailInformation
                 + "'");
         ReplaceFileConversationContext context = new ReplaceFileConversationContext(collectionID, fileID,
-                sizeOfNewFile, url, checksumForDeleteAtPillar, checksumRequestedForDeletedFile, 
-                checksumForNewFileValidationAtPillar, checksumRequestsForNewFile, settings, messageBus, 
-                clientID, Arrays.asList(pillarID), eventHandler, auditTrailInformation);
+                sizeOfNewFile, url, checksumForDeleteAtPillar, checksumRequestedForDeletedFile,
+                checksumForNewFileValidationAtPillar, checksumRequestsForNewFile, settings, messageBus,
+                clientID, List.of(pillarID), eventHandler, auditTrailInformation);
         startConversation(context, new IdentifyPillarsForReplaceFile(context));
     }
 }
diff --git a/bitrepository-client/src/main/java/org/bitrepository/modify/replacefile/ReplaceFileClient.java b/bitrepository-client/src/main/java/org/bitrepository/modify/replacefile/ReplaceFileClient.java
index afc933470..71ccb7771 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/modify/replacefile/ReplaceFileClient.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/modify/replacefile/ReplaceFileClient.java
@@ -1,66 +1,69 @@
 /*
  * #%L
  * Bitmagasin modify client
- * 
+ *
  * $Id: DeleteFileClient.java 631 2011-12-13 17:56:54Z jolf $
- * $HeadURL: https://sbforge.org/svn/bitrepository/bitrepository-reference/trunk/bitrepository-modifying-client/src/main/java/org/bitrepository/modify/deletefile/DeleteFileClient.java $
+ * $HeadURL: https://sbforge.org/svn/bitrepository/bitrepository-reference/trunk/bitrepository-modifying-client/src/main/java/org
+ * /bitrepository/modify/deletefile/DeleteFileClient.java $
  * %%
  * Copyright (C) 2010 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.modify.replacefile;
 
-import java.net.URL;
-
 import org.bitrepository.bitrepositoryelements.ChecksumDataForFileTYPE;
 import org.bitrepository.bitrepositoryelements.ChecksumSpecTYPE;
-import org.bitrepository.client.BitrepositoryClient;
+import org.bitrepository.client.BitRepositoryClient;
 import org.bitrepository.client.eventhandler.EventHandler;
 
+import java.net.URL;
+
 /**
  * Interface for the delete client.
  */
-public interface ReplaceFileClient extends BitrepositoryClient {
+public interface ReplaceFileClient extends BitRepositoryClient {
     /**
      * Starts the conversation for replacing a file on a given pillar.
      * It is similar to performing the DeleteFile followed by the PutFile operations.
      * Since both of these takes two checksum arguments each, then this takes four!
-     * @param collectionID The collection to replace the file in.
-     * @param fileID The id of the file to replace.
-     * @param pillarID The id of the pillar, where the file should be replaced.
-     * @param checksumForDeleteAtPillar The checksum of the file on the pillar which should be replaced. Used for 
-     * validating at pillar-side.
-     * @param checksumRequestedForDeletedFile [OPTIONAL] Request for calculation of the checksum of the file which 
-     * should be replaced at the pillar. Used for client-side validation.
-     * @param url The URL of the new file to replaced the old one.
-     * @param sizeOfNewFile The size of the new file.
-     * @param checksumForNewFileValidationAtPillar [OPTIONAL] The checksum of the new file. Used for pillar-side 
-     * validation.
-     * @param checksumRequestsForNewFile [OPTIONAL] Request for a checksum calculation of the new file. Used for 
-     * client-side validation.
-     * @param eventHandler [OPTIONAL] The handler which should receive notifications of the events occurring in 
-     * connection with the pillar communication. This is allowed to be null.
-     * In a good case scenario this will give the events: <p> 
-     * IdentifyPillarsRequestSent, PillarIdentified, PillarSelected, RequestSent, Progress, PillarComplete, Complete
-     * @param auditTrailInformation The audit information for the given operation. E.g. who is behind the operation 
-     * call.
+     *
+     * @param collectionID                         The collection to replace the file in.
+     * @param fileID                               The id of the file to replace.
+     * @param pillarID                             The id of the pillar, where the file should be replaced.
+     * @param checksumForDeleteAtPillar            The checksum of the file on the pillar which should be replaced. Used for
+     *                                             validating at pillar-side.
+     * @param checksumRequestedForDeletedFile      [OPTIONAL] Request for calculation of the checksum of the file which
+     *                                             should be replaced at the pillar. Used for client-side validation.
+     * @param url                                  The URL of the new file to replace the old one.
+     * @param sizeOfNewFile                        The size of the new file.
+     * @param checksumForNewFileValidationAtPillar [OPTIONAL] The checksum of the new file. Used for pillar-side
+     *                                             validation.
+     * @param checksumRequestsForNewFile           [OPTIONAL] Request for a checksum calculation of the new file. Used for
+     *                                             client-side validation.
+     * @param eventHandler                         [OPTIONAL] The handler which should receive notifications of the events occurring in
+     *                                             connection with the pillar communication. This is allowed to be null.
+     *                                             In a good case scenario this will give the events: <p>
+     *                                             IdentifyPillarsRequestSent, PillarIdentified, PillarSelected, RequestSent, Progress,
+     *                                             PillarComplete, Complete
+     * @param auditTrailInformation                The audit information for the given operation. E.g. who is behind the operation
+     *                                             call.
      */
     void replaceFile(String collectionID, String fileID, String pillarID, ChecksumDataForFileTYPE checksumForDeleteAtPillar,
-            ChecksumSpecTYPE checksumRequestedForDeletedFile, URL url, long sizeOfNewFile, 
-            ChecksumDataForFileTYPE checksumForNewFileValidationAtPillar, ChecksumSpecTYPE checksumRequestsForNewFile, 
-            EventHandler eventHandler, String auditTrailInformation);
+                     ChecksumSpecTYPE checksumRequestedForDeletedFile, URL url, long sizeOfNewFile,
+                     ChecksumDataForFileTYPE checksumForNewFileValidationAtPillar, ChecksumSpecTYPE checksumRequestsForNewFile,
+                     EventHandler eventHandler, String auditTrailInformation);
 }
diff --git a/bitrepository-client/src/main/java/org/bitrepository/modify/replacefile/conversation/IdentifyPillarsForReplaceFile.java b/bitrepository-client/src/main/java/org/bitrepository/modify/replacefile/conversation/IdentifyPillarsForReplaceFile.java
index f1a2daab4..0cc160cf1 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/modify/replacefile/conversation/IdentifyPillarsForReplaceFile.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/modify/replacefile/conversation/IdentifyPillarsForReplaceFile.java
@@ -1,23 +1,24 @@
 /*
  * #%L
  * Bitrepository Access
- * 
+ *
  * $Id: IdentifyPillarsForDeleteFile.java 639 2011-12-15 10:24:45Z jolf $
- * $HeadURL: https://sbforge.org/svn/bitrepository/bitrepository-reference/trunk/bitrepository-modifying-client/src/main/java/org/bitrepository/modify/deletefile/conversation/IdentifyPillarsForDeleteFile.java $
+ * $HeadURL: https://sbforge.org/svn/bitrepository/bitrepository-reference/trunk/bitrepository-modifying-client/src/main/java/org
+ * /bitrepository/modify/deletefile/conversation/IdentifyPillarsForDeleteFile.java $
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -49,8 +50,8 @@ public IdentifyPillarsForReplaceFile(ReplaceFileConversationContext context) {
 
     /**
      * Extends the default behaviour with a idempotent aspects. This assumes that the replace on a pillar is successful if
-     * if new file is the one already present on the pillar.
-     *
+     * new file is the one already present on the pillar.
+     * <p/>
      * Any other none-positive response is handled as a fatal problem.
      */
     @Override
diff --git a/bitrepository-client/src/main/java/org/bitrepository/modify/replacefile/conversation/ReplaceFileCompletePillarEvent.java b/bitrepository-client/src/main/java/org/bitrepository/modify/replacefile/conversation/ReplaceFileCompletePillarEvent.java
index ca54a74ca..8e432942a 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/modify/replacefile/conversation/ReplaceFileCompletePillarEvent.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/modify/replacefile/conversation/ReplaceFileCompletePillarEvent.java
@@ -1,23 +1,24 @@
 /*
  * #%L
  * Bitrepository Access
- * 
+ *
  * $Id: ChecksumsCompletePillarEvent.java 548 2011-11-21 16:43:43Z jolf $
- * $HeadURL: https://sbforge.org/svn/bitrepository/bitrepository-reference/trunk/bitrepository-access-client/src/main/java/org/bitrepository/access/getchecksums/conversation/ChecksumsCompletePillarEvent.java $
+ * $HeadURL: https://sbforge.org/svn/bitrepository/bitrepository-reference/trunk/bitrepository-access-client/src/main/java/org
+ * /bitrepository/access/getchecksums/conversation/ChecksumsCompletePillarEvent.java $
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -28,19 +29,17 @@
 import org.bitrepository.client.eventhandler.ContributorCompleteEvent;
 
 /**
-* Contains the result of a ReplaceFile request sent to a single pillar.
-*/
+ * Contains the result of a ReplaceFile request sent to a single pillar.
+ */
 public class ReplaceFileCompletePillarEvent extends ContributorCompleteEvent {
-    /** @see #getChecksumForDeletedFile(). */
     private final ChecksumDataForFileTYPE replacedFileChecksum;
-    /** @see #getChecksumForNewFile(). */
     private final ChecksumDataForFileTYPE newFileChecksum;
-    
+
     /**
-     * @param pillarID The pillar which generated the result
+     * @param pillarID     The pillar which generated the result
      * @param collectionID The ID of the collection
-     * @param deletedFile The results of the checksum request for the deleted file from the pillar.
-     * @param newFile The results of the checksum request for the new file from the pillar.
+     * @param deletedFile  The results of the checksum request for the deleted file from the pillar.
+     * @param newFile      The results of the checksum request for the new file from the pillar.
      */
     public ReplaceFileCompletePillarEvent(
             String pillarID, String collectionID, ChecksumDataForFileTYPE deletedFile, ChecksumDataForFileTYPE newFile) {
@@ -49,21 +48,21 @@ public ReplaceFileCompletePillarEvent(
         this.replacedFileChecksum = deletedFile;
     }
 
-    /** 
-     * @return The checksum result for the deleted file from a single pillar. 
+    /**
+     * @return The checksum result for the deleted file from a single pillar.
      */
     public ChecksumDataForFileTYPE getChecksumForReplacedFile() {
         return replacedFileChecksum;
     }
-    
-    /** 
-     * @return The checksum result for the new file from a single pillar. 
+
+    /**
+     * @return The checksum result for the new file from a single pillar.
      */
     public ChecksumDataForFileTYPE getChecksumForNewFile() {
         return newFileChecksum;
     }
-    
-    @Override 
+
+    @Override
     public String additionalInfo() {
         return super.additionalInfo() + ", checksum for new file: '" + newFileChecksum + "'," +
                 "checksum for replaced file: '" + replacedFileChecksum + "' ";
diff --git a/bitrepository-client/src/main/java/org/bitrepository/modify/replacefile/conversation/ReplaceFileConversationContext.java b/bitrepository-client/src/main/java/org/bitrepository/modify/replacefile/conversation/ReplaceFileConversationContext.java
index 0a3998843..5d53b170f 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/modify/replacefile/conversation/ReplaceFileConversationContext.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/modify/replacefile/conversation/ReplaceFileConversationContext.java
@@ -5,25 +5,22 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.modify.replacefile.conversation;
 
-import java.math.BigInteger;
-import java.net.URL;
-import java.util.Collection;
 import org.bitrepository.bitrepositoryelements.ChecksumDataForFileTYPE;
 import org.bitrepository.bitrepositoryelements.ChecksumSpecTYPE;
 import org.bitrepository.client.conversation.ConversationContext;
@@ -32,19 +29,25 @@
 import org.bitrepository.protocol.OperationType;
 import org.bitrepository.protocol.messagebus.MessageSender;
 
+import java.math.BigInteger;
+import java.net.URL;
+import java.util.Collection;
+
 public class ReplaceFileConversationContext extends ConversationContext {
     private final BigInteger sizeOfNewFile;
     private final URL urlForFile;
     private final ChecksumDataForFileTYPE checksumForNewFileValidationAtPillar;
     private final ChecksumSpecTYPE checksumRequestsForNewFile;
-    private final ChecksumDataForFileTYPE checksumForDeleteAtPillar; 
+    private final ChecksumDataForFileTYPE checksumForDeleteAtPillar;
     private final ChecksumSpecTYPE checksumRequestedForDeletedFile;
-    
+
     public ReplaceFileConversationContext(String collectionID, String fileID, long sizeOfNewFile, URL urlForFile,
-            ChecksumDataForFileTYPE checksumForDeleteAtPillar, ChecksumSpecTYPE checksumRequestedForDeletedFile,
-            ChecksumDataForFileTYPE checksumForNewFileValidationAtPillar, ChecksumSpecTYPE checksumRequestsForNewFile, 
-            Settings settings, MessageSender messageSender, String clientID, Collection<String> contributors,
-            EventHandler eventHandler,String auditTrailInformation) {
+                                          ChecksumDataForFileTYPE checksumForDeleteAtPillar,
+                                          ChecksumSpecTYPE checksumRequestedForDeletedFile,
+                                          ChecksumDataForFileTYPE checksumForNewFileValidationAtPillar,
+                                          ChecksumSpecTYPE checksumRequestsForNewFile,
+                                          Settings settings, MessageSender messageSender, String clientID, Collection<String> contributors,
+                                          EventHandler eventHandler, String auditTrailInformation) {
         super(collectionID, OperationType.REPLACE_FILE, settings, messageSender, clientID, fileID,
                 contributors, eventHandler, auditTrailInformation);
         this.urlForFile = urlForFile;
@@ -58,23 +61,23 @@ public ReplaceFileConversationContext(String collectionID, String fileID, long s
     public ChecksumDataForFileTYPE getChecksumForNewFileValidationAtPillar() {
         return checksumForNewFileValidationAtPillar;
     }
-    
+
     public ChecksumSpecTYPE getChecksumRequestsForNewFile() {
         return checksumRequestsForNewFile;
     }
-    
+
     public ChecksumDataForFileTYPE getChecksumForDeleteAtPillar() {
         return checksumForDeleteAtPillar;
     }
-    
+
     public ChecksumSpecTYPE getChecksumRequestedForDeletedFile() {
         return checksumRequestedForDeletedFile;
     }
-    
+
     public BigInteger getSizeOfNewFile() {
         return sizeOfNewFile;
     }
-    
+
     public URL getUrlForFile() {
         return urlForFile;
     }
diff --git a/bitrepository-client/src/main/java/org/bitrepository/modify/replacefile/conversation/ReplacingFile.java b/bitrepository-client/src/main/java/org/bitrepository/modify/replacefile/conversation/ReplacingFile.java
index 5ba6b26db..026cebb77 100644
--- a/bitrepository-client/src/main/java/org/bitrepository/modify/replacefile/conversation/ReplacingFile.java
+++ b/bitrepository-client/src/main/java/org/bitrepository/modify/replacefile/conversation/ReplacingFile.java
@@ -1,30 +1,30 @@
 /*
  * #%L
  * Bitrepository Modifying Client
- * 
+ *
  * $Id: DeletingFile.java 631 2011-12-13 17:56:54Z jolf $
- * $HeadURL: https://sbforge.org/svn/bitrepository/bitrepository-reference/trunk/bitrepository-modifying-client/src/main/java/org/bitrepository/modify/deletefile/conversation/DeletingFile.java $
+ * $HeadURL: https://sbforge.org/svn/bitrepository/bitrepository-reference/trunk/bitrepository-modifying-client/src/main/java/org
+ * /bitrepository/modify/deletefile/conversation/DeletingFile.java $
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.modify.replacefile.conversation;
 
-import java.util.Collection;
 import org.bitrepository.bitrepositorymessages.MessageResponse;
 import org.bitrepository.bitrepositorymessages.ReplaceFileFinalResponse;
 import org.bitrepository.bitrepositorymessages.ReplaceFileRequest;
@@ -34,19 +34,21 @@
 import org.bitrepository.client.exceptions.UnexpectedResponseException;
 import org.bitrepository.common.utils.ChecksumUtils;
 
+import java.util.Collection;
+
 /**
  * Models the behavior of a ReplaceFile conversation during the operation phase. That is, it begins with the sending of
- * <code>ReplaceFileRequest</code> messages and finishes with the reception of the 
- * <code>ReplaceFileFinalResponse</code> messages from all responding pillars. 
- *
- * Note that this is only used by the ReplaceFileConversation in the same package, therefore the visibility is package 
+ * <code>ReplaceFileRequest</code> messages and finishes with the reception of the
+ * <code>ReplaceFileFinalResponse</code> messages from all responding pillars.
+ * <p>
+ * Note that this is only used by the ReplaceFileConversation in the same package, therefore the visibility is package
  * protected.
  */
 public class ReplacingFile extends PerformingOperationState {
     private final ReplaceFileConversationContext context;
 
-    /*
-     * @param context The conversation context.
+    /**
+     * @param context      The conversation context.
      * @param contributors The list of components the fileIDs should be collected from.
      */
     public ReplacingFile(ReplaceFileConversationContext context, Collection<SelectedComponentInfo> contributors) {
@@ -62,13 +64,13 @@ protected void generateContributorCompleteEvent(MessageResponse msg) throws Unex
                 response.getCollectionID(),
                 response.getChecksumDataForExistingFile(),
                 response.getChecksumDataForNewFile()
-                ));
+        ));
     }
 
     @Override
     protected void sendRequest() {
         context.getMonitor().requestSent("Sending request for replace file", activeContributors.keySet().toString());
-        for(String pillar : activeContributors.keySet()) {
+        for (String pillar : activeContributors.keySet()) {
             ReplaceFileRequest msg = createRequest(pillar);
             if (context.getChecksumRequestsForNewFile() != null) {
                 if (!context.isChecksumPillar(pillar) ||
diff --git a/bitrepository-client/src/test/java/org/bitrepository/access/MessageSenderStub.java b/bitrepository-client/src/test/java/org/bitrepository/access/MessageSenderStub.java
index 7e922f496..66cb2483f 100644
--- a/bitrepository-client/src/test/java/org/bitrepository/access/MessageSenderStub.java
+++ b/bitrepository-client/src/test/java/org/bitrepository/access/MessageSenderStub.java
@@ -21,14 +21,14 @@
  */
 package org.bitrepository.access;
 
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.TimeUnit;
-
 import org.bitrepository.bitrepositorymessages.Message;
 import org.bitrepository.protocol.messagebus.MessageSender;
 import org.jaccept.TestEventManager;
 
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
+
 public class MessageSenderStub implements MessageSender {
 
     /** The <code>TestEventManager</code> used to manage the event for the associated test. */
diff --git a/bitrepository-client/src/test/java/org/bitrepository/access/getaudittrails/AuditTrailClientComponentTest.java b/bitrepository-client/src/test/java/org/bitrepository/access/getaudittrails/AuditTrailClientComponentTest.java
index a73a4f8cc..3ec4e8bf3 100644
--- a/bitrepository-client/src/test/java/org/bitrepository/access/getaudittrails/AuditTrailClientComponentTest.java
+++ b/bitrepository-client/src/test/java/org/bitrepository/access/getaudittrails/AuditTrailClientComponentTest.java
@@ -21,9 +21,6 @@
  */
 package org.bitrepository.access.getaudittrails;
 
-import java.math.BigInteger;
-import java.util.concurrent.TimeUnit;
-
 import org.bitrepository.access.AccessComponentFactory;
 import org.bitrepository.access.getaudittrails.client.AuditTrailResult;
 import org.bitrepository.bitrepositoryelements.AuditTrailEvent;
@@ -49,6 +46,8 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import java.math.BigInteger;
+
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
 
diff --git a/bitrepository-client/src/test/java/org/bitrepository/access/getaudittrails/AuditTrailClientTestWrapper.java b/bitrepository-client/src/test/java/org/bitrepository/access/getaudittrails/AuditTrailClientTestWrapper.java
index 7948f3d6a..8b33472c0 100644
--- a/bitrepository-client/src/test/java/org/bitrepository/access/getaudittrails/AuditTrailClientTestWrapper.java
+++ b/bitrepository-client/src/test/java/org/bitrepository/access/getaudittrails/AuditTrailClientTestWrapper.java
@@ -21,13 +21,11 @@
  */
 package org.bitrepository.access.getaudittrails;
 
-import java.util.Arrays;
-
-import org.bitrepository.access.getaudittrails.AuditTrailClient;
-import org.bitrepository.access.getaudittrails.AuditTrailQuery;
 import org.bitrepository.client.eventhandler.EventHandler;
 import org.jaccept.TestEventManager;
 
+import java.util.Arrays;
+
 public class AuditTrailClientTestWrapper implements AuditTrailClient {
     private AuditTrailClient auditTrailClient;
     private TestEventManager testEventManager;
diff --git a/bitrepository-client/src/test/java/org/bitrepository/access/getaudittrails/GetAuditTrailsMessageFactory.java b/bitrepository-client/src/test/java/org/bitrepository/access/getaudittrails/GetAuditTrailsMessageFactory.java
index 3ae95154d..9e0667245 100644
--- a/bitrepository-client/src/test/java/org/bitrepository/access/getaudittrails/GetAuditTrailsMessageFactory.java
+++ b/bitrepository-client/src/test/java/org/bitrepository/access/getaudittrails/GetAuditTrailsMessageFactory.java
@@ -40,7 +40,6 @@
 package org.bitrepository.access.getaudittrails;
 
 import org.bitrepository.bitrepositoryelements.ResultingAuditTrails;
-
 import org.bitrepository.bitrepositorymessages.GetAuditTrailsFinalResponse;
 import org.bitrepository.bitrepositorymessages.GetAuditTrailsProgressResponse;
 import org.bitrepository.bitrepositorymessages.GetAuditTrailsRequest;
diff --git a/bitrepository-client/src/test/java/org/bitrepository/access/getchecksums/GetChecksumsClientComponentTest.java b/bitrepository-client/src/test/java/org/bitrepository/access/getchecksums/GetChecksumsClientComponentTest.java
index f40c95f39..0828000cd 100644
--- a/bitrepository-client/src/test/java/org/bitrepository/access/getchecksums/GetChecksumsClientComponentTest.java
+++ b/bitrepository-client/src/test/java/org/bitrepository/access/getchecksums/GetChecksumsClientComponentTest.java
@@ -39,16 +39,8 @@
  */
 package org.bitrepository.access.getchecksums;
 
-import java.math.BigInteger;
-import java.net.URL;
-import java.util.Collection;
-import java.util.Date;
-import java.util.LinkedList;
-
 import org.bitrepository.access.AccessComponentFactory;
 import org.bitrepository.access.ContributorQuery;
-import org.bitrepository.access.getchecksums.ConversationBasedGetChecksumsClient;
-import org.bitrepository.access.getchecksums.GetChecksumsClient;
 import org.bitrepository.bitrepositoryelements.ChecksumSpecTYPE;
 import org.bitrepository.bitrepositoryelements.ChecksumType;
 import org.bitrepository.bitrepositoryelements.ResponseCode;
@@ -69,6 +61,12 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import java.math.BigInteger;
+import java.net.URL;
+import java.util.Collection;
+import java.util.Date;
+import java.util.LinkedList;
+
 import static org.testng.Assert.assertEquals;
 
 /**
diff --git a/bitrepository-client/src/test/java/org/bitrepository/access/getchecksums/GetChecksumsClientTestWrapper.java b/bitrepository-client/src/test/java/org/bitrepository/access/getchecksums/GetChecksumsClientTestWrapper.java
index 2693a292c..e00e0aae4 100644
--- a/bitrepository-client/src/test/java/org/bitrepository/access/getchecksums/GetChecksumsClientTestWrapper.java
+++ b/bitrepository-client/src/test/java/org/bitrepository/access/getchecksums/GetChecksumsClientTestWrapper.java
@@ -24,15 +24,14 @@
  */
 package org.bitrepository.access.getchecksums;
 
-import java.net.URL;
-import java.util.Arrays;
-
 import org.bitrepository.access.ContributorQuery;
-import org.bitrepository.access.getchecksums.GetChecksumsClient;
 import org.bitrepository.bitrepositoryelements.ChecksumSpecTYPE;
 import org.bitrepository.client.eventhandler.EventHandler;
 import org.jaccept.TestEventManager;
 
+import java.net.URL;
+import java.util.Arrays;
+
 /**
  * Wraps the <code>GetFileClient</code> adding test event logging and functionality for handling blocking calls.
  */
diff --git a/bitrepository-client/src/test/java/org/bitrepository/access/getfile/GetFileClientComponentTest.java b/bitrepository-client/src/test/java/org/bitrepository/access/getfile/GetFileClientComponentTest.java
index 01bcb77a3..4bd294ad8 100644
--- a/bitrepository-client/src/test/java/org/bitrepository/access/getfile/GetFileClientComponentTest.java
+++ b/bitrepository-client/src/test/java/org/bitrepository/access/getfile/GetFileClientComponentTest.java
@@ -24,13 +24,7 @@
  */
 package org.bitrepository.access.getfile;
 
-import java.math.BigInteger;
-import java.net.URL;
-import java.util.concurrent.TimeUnit;
-
 import org.bitrepository.access.AccessComponentFactory;
-import org.bitrepository.access.getfile.ConversationBasedGetFileClient;
-import org.bitrepository.access.getfile.GetFileClient;
 import org.bitrepository.bitrepositoryelements.FilePart;
 import org.bitrepository.bitrepositoryelements.ResponseCode;
 import org.bitrepository.bitrepositoryelements.TimeMeasureTYPE;
@@ -47,6 +41,9 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
+import java.math.BigInteger;
+import java.net.URL;
+
 import static org.testng.Assert.assertEquals;
 
 /**
@@ -57,7 +54,7 @@ public class GetFileClientComponentTest extends AbstractGetFileClientTest {
     private static FilePart NO_FILE_PART = null;
 
     @Test(groups = {"regressiontest"})
-    public void verifyGetFileClientFromFactory() throws Exception {
+    public void verifyGetFileClientFromFactory() {
         Assert.assertTrue(AccessComponentFactory.getInstance().createGetFileClient(
                 settingsForCUT, securityManager, settingsForTestClient.getComponentID())
                 instanceof ConversationBasedGetFileClient,
diff --git a/bitrepository-client/src/test/java/org/bitrepository/access/getfile/GetFileClientTestWrapper.java b/bitrepository-client/src/test/java/org/bitrepository/access/getfile/GetFileClientTestWrapper.java
index 040030688..7b1bdf662 100644
--- a/bitrepository-client/src/test/java/org/bitrepository/access/getfile/GetFileClientTestWrapper.java
+++ b/bitrepository-client/src/test/java/org/bitrepository/access/getfile/GetFileClientTestWrapper.java
@@ -24,13 +24,12 @@
  */
 package org.bitrepository.access.getfile;
 
-import java.net.URL;
-
-import org.bitrepository.access.getfile.GetFileClient;
 import org.bitrepository.bitrepositoryelements.FilePart;
 import org.bitrepository.client.eventhandler.EventHandler;
 import org.jaccept.TestEventManager;
 
+import java.net.URL;
+
 /**
  * Wraps the <code>GetFileClient</code> adding test event logging and functionality for handling blocking calls.
  */
diff --git a/bitrepository-client/src/test/java/org/bitrepository/access/getfileids/GetFileIDsClientComponentTest.java b/bitrepository-client/src/test/java/org/bitrepository/access/getfileids/GetFileIDsClientComponentTest.java
index 07e523c54..66ea0c8fa 100644
--- a/bitrepository-client/src/test/java/org/bitrepository/access/getfileids/GetFileIDsClientComponentTest.java
+++ b/bitrepository-client/src/test/java/org/bitrepository/access/getfileids/GetFileIDsClientComponentTest.java
@@ -26,8 +26,6 @@
 
 import org.bitrepository.access.AccessComponentFactory;
 import org.bitrepository.access.ContributorQuery;
-import org.bitrepository.access.getfileids.ConversationBasedGetFileIDsClient;
-import org.bitrepository.access.getfileids.GetFileIDsClient;
 import org.bitrepository.access.getfileids.conversation.FileIDsCompletePillarEvent;
 import org.bitrepository.bitrepositoryelements.FileIDs;
 import org.bitrepository.bitrepositoryelements.FileIDsData;
diff --git a/bitrepository-client/src/test/java/org/bitrepository/access/getfileids/GetFileIDsClientTestWrapper.java b/bitrepository-client/src/test/java/org/bitrepository/access/getfileids/GetFileIDsClientTestWrapper.java
index f6a55403d..20e2811c1 100644
--- a/bitrepository-client/src/test/java/org/bitrepository/access/getfileids/GetFileIDsClientTestWrapper.java
+++ b/bitrepository-client/src/test/java/org/bitrepository/access/getfileids/GetFileIDsClientTestWrapper.java
@@ -24,14 +24,13 @@
  */
 package org.bitrepository.access.getfileids;
 
-import java.net.URL;
-import java.util.Arrays;
-
 import org.bitrepository.access.ContributorQuery;
-import org.bitrepository.access.getfileids.GetFileIDsClient;
 import org.bitrepository.client.eventhandler.EventHandler;
 import org.jaccept.TestEventManager;
 
+import java.net.URL;
+import java.util.Arrays;
+
 /**
  * Wraps the <code>GetFileIDsClient</code> adding test event logging and functionality.
  */
diff --git a/bitrepository-client/src/test/java/org/bitrepository/access/getstatus/GetStatusClientComponentTest.java b/bitrepository-client/src/test/java/org/bitrepository/access/getstatus/GetStatusClientComponentTest.java
index 194ce878a..d7255c902 100644
--- a/bitrepository-client/src/test/java/org/bitrepository/access/getstatus/GetStatusClientComponentTest.java
+++ b/bitrepository-client/src/test/java/org/bitrepository/access/getstatus/GetStatusClientComponentTest.java
@@ -22,8 +22,6 @@
 package org.bitrepository.access.getstatus;
 
 import org.bitrepository.access.AccessComponentFactory;
-import org.bitrepository.access.getstatus.ConversationBasedGetStatusClient;
-import org.bitrepository.access.getstatus.GetStatusClient;
 import org.bitrepository.access.getstatus.conversation.StatusCompleteContributorEvent;
 import org.bitrepository.bitrepositoryelements.ResultingStatus;
 import org.bitrepository.bitrepositoryelements.StatusCode;
diff --git a/bitrepository-client/src/test/java/org/bitrepository/access/getstatus/GetStatusClientTestWrapper.java b/bitrepository-client/src/test/java/org/bitrepository/access/getstatus/GetStatusClientTestWrapper.java
index 879fccc94..61413eaee 100644
--- a/bitrepository-client/src/test/java/org/bitrepository/access/getstatus/GetStatusClientTestWrapper.java
+++ b/bitrepository-client/src/test/java/org/bitrepository/access/getstatus/GetStatusClientTestWrapper.java
@@ -21,7 +21,6 @@
  */
 package org.bitrepository.access.getstatus;
 
-import org.bitrepository.access.getstatus.GetStatusClient;
 import org.bitrepository.client.eventhandler.EventHandler;
 import org.jaccept.TestEventManager;
 
diff --git a/bitrepository-client/src/test/java/org/bitrepository/client/DefaultClientTest.java b/bitrepository-client/src/test/java/org/bitrepository/client/DefaultClientTest.java
index ea54d8b7f..26a369955 100644
--- a/bitrepository-client/src/test/java/org/bitrepository/client/DefaultClientTest.java
+++ b/bitrepository-client/src/test/java/org/bitrepository/client/DefaultClientTest.java
@@ -21,18 +21,16 @@
  * #L%
  */
 
-import java.math.BigInteger;
-import java.util.concurrent.TimeUnit;
-
 import org.bitrepository.bitrepositoryelements.ResponseCode;
 import org.bitrepository.bitrepositorymessages.MessageRequest;
 import org.bitrepository.bitrepositorymessages.MessageResponse;
 import org.bitrepository.client.eventhandler.OperationEvent;
 import org.bitrepository.client.eventhandler.OperationEvent.OperationEventType;
 import org.bitrepository.protocol.bus.MessageReceiver;
-import org.testng.Assert;
 import org.testng.annotations.Test;
 
+import java.math.BigInteger;
+
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
 
diff --git a/bitrepository-client/src/test/java/org/bitrepository/client/TestEventHandler.java b/bitrepository-client/src/test/java/org/bitrepository/client/TestEventHandler.java
index 42f95a919..f8cb988d3 100644
--- a/bitrepository-client/src/test/java/org/bitrepository/client/TestEventHandler.java
+++ b/bitrepository-client/src/test/java/org/bitrepository/client/TestEventHandler.java
@@ -24,13 +24,13 @@
  */
 package org.bitrepository.client;
 
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.TimeUnit;
 import org.bitrepository.client.eventhandler.EventHandler;
 import org.bitrepository.client.eventhandler.OperationEvent;
 import org.jaccept.TestEventManager;
-import org.testng.Assert;
+
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
 
 import static org.testng.Assert.assertNull;
 
diff --git a/bitrepository-client/src/test/java/org/bitrepository/client/exception/NegativeResponseExceptionTest.java b/bitrepository-client/src/test/java/org/bitrepository/client/exception/NegativeResponseExceptionTest.java
index 8c05b008d..b99f6ec45 100644
--- a/bitrepository-client/src/test/java/org/bitrepository/client/exception/NegativeResponseExceptionTest.java
+++ b/bitrepository-client/src/test/java/org/bitrepository/client/exception/NegativeResponseExceptionTest.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -28,22 +28,22 @@
 import org.testng.annotations.Test;
 
 public class NegativeResponseExceptionTest extends ExtendedTestCase {
-    
-    @Test(groups = { "regressiontest" })
-    public void testNegativeResponse() throws Exception {
+
+    @Test(groups = {"regressiontest"})
+    public void testNegativeResponse() {
         addDescription("Test the instantiation of the exception");
         addStep("Setup", "");
         String errMsg = "TEST-EXCEPTION";
         ResponseCode responseCode = ResponseCode.FAILURE;
-        
-        addStep("Try to throw such an exception with the response code", 
+
+        addStep("Try to throw such an exception with the response code",
                 "Should be able to be caught and validated");
         try {
             throw new NegativeResponseException(errMsg, responseCode);
-        } catch(Exception e) {
+        } catch (Exception e) {
             Assert.assertTrue(e instanceof NegativeResponseException);
             Assert.assertEquals(e.getMessage(), errMsg);
-            Assert.assertEquals(((NegativeResponseException) e).getErrorcode(), responseCode);
+            Assert.assertEquals(((NegativeResponseException) e).getErrorCode(), responseCode);
             Assert.assertNull(e.getCause());
         }
     }
diff --git a/bitrepository-client/src/test/java/org/bitrepository/commandline/DeleteFileCmdTest.java b/bitrepository-client/src/test/java/org/bitrepository/commandline/DeleteFileCmdTest.java
index 9c3f38691..2ffe6119a 100644
--- a/bitrepository-client/src/test/java/org/bitrepository/commandline/DeleteFileCmdTest.java
+++ b/bitrepository-client/src/test/java/org/bitrepository/commandline/DeleteFileCmdTest.java
@@ -21,12 +21,12 @@
  */
 package org.bitrepository.commandline;
 
-import java.util.Date;
-
 import org.bitrepository.client.DefaultFixtureClientTest;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import java.util.Date;
+
 public class DeleteFileCmdTest extends DefaultFixtureClientTest {
     private static final String SETTINGS_DIR = "settings/xml/bitrepository-devel";
     private static final String KEY_FILE = "KeyFile";
diff --git a/bitrepository-client/src/test/java/org/bitrepository/commandline/GetChecksumsCmdTest.java b/bitrepository-client/src/test/java/org/bitrepository/commandline/GetChecksumsCmdTest.java
index c13d5a418..300fa7aa1 100644
--- a/bitrepository-client/src/test/java/org/bitrepository/commandline/GetChecksumsCmdTest.java
+++ b/bitrepository-client/src/test/java/org/bitrepository/commandline/GetChecksumsCmdTest.java
@@ -21,12 +21,12 @@
  */
 package org.bitrepository.commandline;
 
-import java.util.Date;
-
 import org.bitrepository.client.DefaultFixtureClientTest;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import java.util.Date;
+
 public class GetChecksumsCmdTest extends DefaultFixtureClientTest {
     private static final String SETTINGS_DIR = "settings/xml/bitrepository-devel";
     private static final String KEY_FILE = "KeyFile";
diff --git a/bitrepository-client/src/test/java/org/bitrepository/commandline/GetFileCmdTest.java b/bitrepository-client/src/test/java/org/bitrepository/commandline/GetFileCmdTest.java
index db80e77e0..13443cfbd 100644
--- a/bitrepository-client/src/test/java/org/bitrepository/commandline/GetFileCmdTest.java
+++ b/bitrepository-client/src/test/java/org/bitrepository/commandline/GetFileCmdTest.java
@@ -21,12 +21,12 @@
  */
 package org.bitrepository.commandline;
 
-import java.util.Date;
-
 import org.bitrepository.client.DefaultFixtureClientTest;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import java.util.Date;
+
 public class GetFileCmdTest extends DefaultFixtureClientTest {
     private static final String SETTINGS_DIR = "settings/xml/bitrepository-devel";
     private static final String KEY_FILE = "KeyFile";
diff --git a/bitrepository-client/src/test/java/org/bitrepository/commandline/GetFileIDsCmdTest.java b/bitrepository-client/src/test/java/org/bitrepository/commandline/GetFileIDsCmdTest.java
index b874c0a4c..8ef5aec53 100644
--- a/bitrepository-client/src/test/java/org/bitrepository/commandline/GetFileIDsCmdTest.java
+++ b/bitrepository-client/src/test/java/org/bitrepository/commandline/GetFileIDsCmdTest.java
@@ -21,12 +21,12 @@
  */
 package org.bitrepository.commandline;
 
-import java.util.Date;
-
 import org.bitrepository.client.DefaultFixtureClientTest;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import java.util.Date;
+
 public class GetFileIDsCmdTest extends DefaultFixtureClientTest {
     private static final String SETTINGS_DIR = "settings/xml/bitrepository-devel";
     private static final String KEY_FILE = "KeyFile";
diff --git a/bitrepository-client/src/test/java/org/bitrepository/commandline/PutFileCmdTest.java b/bitrepository-client/src/test/java/org/bitrepository/commandline/PutFileCmdTest.java
index f54eff427..d3a1b9a0e 100644
--- a/bitrepository-client/src/test/java/org/bitrepository/commandline/PutFileCmdTest.java
+++ b/bitrepository-client/src/test/java/org/bitrepository/commandline/PutFileCmdTest.java
@@ -21,12 +21,12 @@
  */
 package org.bitrepository.commandline;
 
-import java.util.Date;
-
 import org.bitrepository.client.DefaultFixtureClientTest;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import java.util.Date;
+
 public class PutFileCmdTest extends DefaultFixtureClientTest {
     private static final String SETTINGS_DIR = "settings/xml/bitrepository-devel";
     private static final String KEY_FILE = "KeyFile";
diff --git a/bitrepository-client/src/test/java/org/bitrepository/commandline/ReplaceFileCmdTest.java b/bitrepository-client/src/test/java/org/bitrepository/commandline/ReplaceFileCmdTest.java
index 9be2f409a..843fd12b5 100644
--- a/bitrepository-client/src/test/java/org/bitrepository/commandline/ReplaceFileCmdTest.java
+++ b/bitrepository-client/src/test/java/org/bitrepository/commandline/ReplaceFileCmdTest.java
@@ -21,12 +21,12 @@
  */
 package org.bitrepository.commandline;
 
-import java.util.Date;
-
 import org.bitrepository.client.DefaultFixtureClientTest;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import java.util.Date;
+
 public class ReplaceFileCmdTest extends DefaultFixtureClientTest {
     private static final String SETTINGS_DIR = "settings/xml/bitrepository-devel";
     private static final String KEY_FILE = "KeyFile";
diff --git a/bitrepository-client/src/test/java/org/bitrepository/commandline/utils/ChecksumExtractionUtilsTest.java b/bitrepository-client/src/test/java/org/bitrepository/commandline/utils/ChecksumExtractionUtilsTest.java
index be5aef19b..019fd6b5e 100644
--- a/bitrepository-client/src/test/java/org/bitrepository/commandline/utils/ChecksumExtractionUtilsTest.java
+++ b/bitrepository-client/src/test/java/org/bitrepository/commandline/utils/ChecksumExtractionUtilsTest.java
@@ -21,11 +21,6 @@
  */
 package org.bitrepository.commandline.utils;
 
-import static org.mockito.Mockito.mock;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotEquals;
-import static org.testng.Assert.assertTrue;
-
 import org.apache.commons.cli.Option;
 import org.bitrepository.bitrepositoryelements.ChecksumType;
 import org.bitrepository.client.DefaultFixtureClientTest;
@@ -34,6 +29,11 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import static org.mockito.Mockito.mock;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotEquals;
+import static org.testng.Assert.assertTrue;
+
 public class ChecksumExtractionUtilsTest extends DefaultFixtureClientTest {
     CommandLineArgumentsHandler cmdHandler;
     OutputHandler output;
diff --git a/bitrepository-client/src/test/java/org/bitrepository/modify/putfile/PutFileClientTestWrapper.java b/bitrepository-client/src/test/java/org/bitrepository/modify/putfile/PutFileClientTestWrapper.java
index 9a9457f53..7866467aa 100644
--- a/bitrepository-client/src/test/java/org/bitrepository/modify/putfile/PutFileClientTestWrapper.java
+++ b/bitrepository-client/src/test/java/org/bitrepository/modify/putfile/PutFileClientTestWrapper.java
@@ -24,13 +24,13 @@
  */
 package org.bitrepository.modify.putfile;
 
-import java.net.URL;
-
 import org.bitrepository.bitrepositoryelements.ChecksumDataForFileTYPE;
 import org.bitrepository.bitrepositoryelements.ChecksumSpecTYPE;
 import org.bitrepository.client.eventhandler.EventHandler;
 import org.jaccept.TestEventManager;
 
+import java.net.URL;
+
 /**
  * Wrapper class for a PutFileClient adding test event logging.
  */
diff --git a/bitrepository-client/src/test/java/org/bitrepository/modify/putfile/TestPutFileMessageFactory.java b/bitrepository-client/src/test/java/org/bitrepository/modify/putfile/TestPutFileMessageFactory.java
index 959c92a1b..1a986d17e 100644
--- a/bitrepository-client/src/test/java/org/bitrepository/modify/putfile/TestPutFileMessageFactory.java
+++ b/bitrepository-client/src/test/java/org/bitrepository/modify/putfile/TestPutFileMessageFactory.java
@@ -39,8 +39,6 @@
  */
 package org.bitrepository.modify.putfile;
 
-import java.math.BigInteger;
-
 import org.bitrepository.bitrepositorymessages.IdentifyPillarsForPutFileRequest;
 import org.bitrepository.bitrepositorymessages.IdentifyPillarsForPutFileResponse;
 import org.bitrepository.bitrepositorymessages.PutFileFinalResponse;
@@ -48,6 +46,8 @@
 import org.bitrepository.bitrepositorymessages.PutFileRequest;
 import org.bitrepository.protocol.message.ClientTestMessageFactory;
 
+import java.math.BigInteger;
+
 /**
  * Messages creation factory for the PutFile tests.
  */
diff --git a/bitrepository-client/src/test/java/org/bitrepository/modify/replacefile/ReplaceFileClientTestWrapper.java b/bitrepository-client/src/test/java/org/bitrepository/modify/replacefile/ReplaceFileClientTestWrapper.java
index c3b343c40..65e1d6360 100644
--- a/bitrepository-client/src/test/java/org/bitrepository/modify/replacefile/ReplaceFileClientTestWrapper.java
+++ b/bitrepository-client/src/test/java/org/bitrepository/modify/replacefile/ReplaceFileClientTestWrapper.java
@@ -24,13 +24,13 @@
  */
 package org.bitrepository.modify.replacefile;
 
-import java.net.URL;
-
 import org.bitrepository.bitrepositoryelements.ChecksumDataForFileTYPE;
 import org.bitrepository.bitrepositoryelements.ChecksumSpecTYPE;
 import org.bitrepository.client.eventhandler.EventHandler;
 import org.jaccept.TestEventManager;
 
+import java.net.URL;
+
 /**
  * Wrapper class for a PutFileClient.
  */
diff --git a/bitrepository-client/src/test/java/org/bitrepository/modify/replacefile/TestReplaceFileMessageFactory.java b/bitrepository-client/src/test/java/org/bitrepository/modify/replacefile/TestReplaceFileMessageFactory.java
index 6f149bf0b..9b154883e 100644
--- a/bitrepository-client/src/test/java/org/bitrepository/modify/replacefile/TestReplaceFileMessageFactory.java
+++ b/bitrepository-client/src/test/java/org/bitrepository/modify/replacefile/TestReplaceFileMessageFactory.java
@@ -24,8 +24,6 @@
  */
 package org.bitrepository.modify.replacefile;
 
-import java.math.BigInteger;
-
 import org.bitrepository.bitrepositoryelements.ChecksumDataForFileTYPE;
 import org.bitrepository.bitrepositoryelements.ChecksumSpecTYPE;
 import org.bitrepository.bitrepositorymessages.IdentifyPillarsForReplaceFileRequest;
@@ -35,6 +33,8 @@
 import org.bitrepository.bitrepositorymessages.ReplaceFileRequest;
 import org.bitrepository.protocol.message.ClientTestMessageFactory;
 
+import java.math.BigInteger;
+
 /**
  * Messages creation factory for the ReplaceFile tests.
  */
diff --git a/bitrepository-core/pom.xml b/bitrepository-core/pom.xml
index a397a265e..81c963a16 100644
--- a/bitrepository-core/pom.xml
+++ b/bitrepository-core/pom.xml
@@ -84,5 +84,11 @@
       <version>1.3</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.jetbrains</groupId>
+      <artifactId>annotations</artifactId>
+      <version>RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/bitrepository-core/src/main/java/org/apache/http/impl/conn/ChunkyManagedHttpClientConnectionFactory.java b/bitrepository-core/src/main/java/org/apache/http/impl/conn/ChunkyManagedHttpClientConnectionFactory.java
index a2fd42aa4..bfac2b81f 100644
--- a/bitrepository-core/src/main/java/org/apache/http/impl/conn/ChunkyManagedHttpClientConnectionFactory.java
+++ b/bitrepository-core/src/main/java/org/apache/http/impl/conn/ChunkyManagedHttpClientConnectionFactory.java
@@ -8,12 +8,12 @@
  * it under the terms of the GNU Lesser General Public License as
  * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
@@ -49,14 +49,14 @@
  * This is a straight copy of ManagedHttpClientConnectionFactory, but it takes a chunksize param. This allows
  * you to control the size of the http chunks.
  */
-public  class ChunkyManagedHttpClientConnectionFactory extends ManagedHttpClientConnectionFactory {
+public class ChunkyManagedHttpClientConnectionFactory extends ManagedHttpClientConnectionFactory {
 
     private static final AtomicLong COUNTER = new AtomicLong();
     private final int chunkSize;
 
     private final Log log = LogFactory.getLog(DefaultManagedHttpClientConnection.class);
-    private final Log headerlog = LogFactory.getLog("org.apache.http.headers");
-    private final Log wirelog = LogFactory.getLog("org.apache.http.wire");
+    private final Log headerLog = LogFactory.getLog("org.apache.http.headers");
+    private final Log wireLog = LogFactory.getLog("org.apache.http.wire");
 
     private final HttpMessageWriterFactory<HttpRequest> requestWriterFactory;
     private final HttpMessageParserFactory<HttpResponse> responseParserFactory;
@@ -67,32 +67,19 @@ public  class ChunkyManagedHttpClientConnectionFactory extends ManagedHttpClient
     public ChunkyManagedHttpClientConnectionFactory(final HttpMessageWriterFactory<HttpRequest> requestWriterFactory,
                                                     final HttpMessageParserFactory<HttpResponse> responseParserFactory,
                                                     final ContentLengthStrategy incomingContentStrategy,
-                                                    final ContentLengthStrategy outgoingContentStrategy,
-                                                    int chunkSize) {
+                                                    final ContentLengthStrategy outgoingContentStrategy, int chunkSize) {
         super();
         this.chunkSize = chunkSize;
-        this.requestWriterFactory = requestWriterFactory != null ? requestWriterFactory :
-                DefaultHttpRequestWriterFactory.INSTANCE;
-        this.responseParserFactory = responseParserFactory != null ? responseParserFactory :
-                DefaultHttpResponseParserFactory.INSTANCE;
-        this.incomingContentStrategy = incomingContentStrategy != null ? incomingContentStrategy :
-                LaxContentLengthStrategy.INSTANCE;
-        this.outgoingContentStrategy = outgoingContentStrategy != null ? outgoingContentStrategy :
-                StrictContentLengthStrategy.INSTANCE;
+        this.requestWriterFactory = requestWriterFactory != null ? requestWriterFactory : DefaultHttpRequestWriterFactory.INSTANCE;
+        this.responseParserFactory = responseParserFactory != null ? responseParserFactory : DefaultHttpResponseParserFactory.INSTANCE;
+        this.incomingContentStrategy = incomingContentStrategy != null ? incomingContentStrategy : LaxContentLengthStrategy.INSTANCE;
+        this.outgoingContentStrategy = outgoingContentStrategy != null ? outgoingContentStrategy : StrictContentLengthStrategy.INSTANCE;
     }
 
 
-    public ChunkyManagedHttpClientConnectionFactory(
-            final HttpMessageWriterFactory<HttpRequest> requestWriterFactory,
-            final HttpMessageParserFactory<HttpResponse> responseParserFactory,
-            int chunkSize) {
-        this(requestWriterFactory, responseParserFactory, null, null,chunkSize);
-    }
-
-    public ChunkyManagedHttpClientConnectionFactory(
-            final HttpMessageParserFactory<HttpResponse> responseParserFactory,
-            int chunkSize) {
-        this(null, responseParserFactory, chunkSize);
+    public ChunkyManagedHttpClientConnectionFactory(final HttpMessageWriterFactory<HttpRequest> requestWriterFactory,
+                                                    final HttpMessageParserFactory<HttpResponse> responseParserFactory, int chunkSize) {
+        this(requestWriterFactory, responseParserFactory, null, null, chunkSize);
     }
 
     public ChunkyManagedHttpClientConnectionFactory(int chunkSize) {
@@ -101,14 +88,15 @@ public ChunkyManagedHttpClientConnectionFactory(int chunkSize) {
 
     @Override
     public ManagedHttpClientConnection create(HttpRoute route, ConnectionConfig config) {
-        final ConnectionConfig cconfig = config != null ? config : ConnectionConfig.DEFAULT;
+        final ConnectionConfig connectionConfig = config != null ? config : ConnectionConfig.DEFAULT;
         CharsetDecoder chardecoder = null;
         CharsetEncoder charencoder = null;
-        final Charset charset = cconfig.getCharset();
-        final CodingErrorAction malformedInputAction = cconfig.getMalformedInputAction() != null ?
-                cconfig.getMalformedInputAction() : CodingErrorAction.REPORT;
-        final CodingErrorAction unmappableInputAction = cconfig.getUnmappableInputAction() != null ?
-                cconfig.getUnmappableInputAction() : CodingErrorAction.REPORT;
+        final Charset charset = connectionConfig.getCharset();
+        final CodingErrorAction malformedInputAction =
+                connectionConfig.getMalformedInputAction() != null ? connectionConfig.getMalformedInputAction() : CodingErrorAction.REPORT;
+        final CodingErrorAction unmappableInputAction =
+                connectionConfig.getUnmappableInputAction() != null ? connectionConfig.getUnmappableInputAction() :
+                        CodingErrorAction.REPORT;
         if (charset != null) {
             chardecoder = charset.newDecoder();
             chardecoder.onMalformedInput(malformedInputAction);
@@ -117,40 +105,35 @@ public ManagedHttpClientConnection create(HttpRoute route, ConnectionConfig conf
             charencoder.onMalformedInput(malformedInputAction);
             charencoder.onUnmappableCharacter(unmappableInputAction);
         }
-        final String id = "http-outgoing-" + Long.toString(COUNTER.getAndIncrement());
-        return new ChunkyLoggingManagedHttpClientConnection(
-                id,
-                log,
-                headerlog,
-                wirelog,
-                cconfig.getBufferSize(),
-                cconfig.getFragmentSizeHint(),
-                chardecoder,
-                charencoder,
-                cconfig.getMessageConstraints(),
+        final String id = "http-outgoing-" + COUNTER.getAndIncrement();
+        return new ChunkyLoggingManagedHttpClientConnection(id, log, headerLog, wireLog, connectionConfig.getBufferSize(),
+                connectionConfig.getFragmentSizeHint(), chardecoder, charencoder, connectionConfig.getMessageConstraints(),
                 incomingContentStrategy,
-                outgoingContentStrategy,
-                requestWriterFactory,
-                responseParserFactory,
-                chunkSize);
+                outgoingContentStrategy, requestWriterFactory, responseParserFactory, chunkSize);
     }
 
     static class ChunkyLoggingManagedHttpClientConnection extends LoggingManagedHttpClientConnection {
         private final int chunkSize;
 
 
-        public ChunkyLoggingManagedHttpClientConnection(String id, Log log, Log headerlog, Log wirelog, int buffersize, int fragmentSizeHint, CharsetDecoder chardecoder, CharsetEncoder charencoder, MessageConstraints constraints, ContentLengthStrategy incomingContentStrategy, ContentLengthStrategy outgoingContentStrategy, HttpMessageWriterFactory<HttpRequest> requestWriterFactory, HttpMessageParserFactory<HttpResponse> responseParserFactory, int chunkSize) {
-            super(id, log, headerlog, wirelog, buffersize, fragmentSizeHint, chardecoder, charencoder, constraints, incomingContentStrategy, outgoingContentStrategy, requestWriterFactory, responseParserFactory);
+        public ChunkyLoggingManagedHttpClientConnection(String id, Log log, Log headerLog, Log wireLog, int bufferSize,
+                                                        int fragmentSizeHint, CharsetDecoder charDecoder, CharsetEncoder charEncoder,
+                                                        MessageConstraints constraints, ContentLengthStrategy incomingContentStrategy,
+                                                        ContentLengthStrategy outgoingContentStrategy,
+                                                        HttpMessageWriterFactory<HttpRequest> requestWriterFactory,
+                                                        HttpMessageParserFactory<HttpResponse> responseParserFactory, int chunkSize) {
+            super(id, log, headerLog, wireLog, bufferSize, fragmentSizeHint, charDecoder, charEncoder, constraints, incomingContentStrategy,
+                    outgoingContentStrategy, requestWriterFactory, responseParserFactory);
             this.chunkSize = chunkSize;
         }
 
 
         @Override
-        protected OutputStream createOutputStream(long len, SessionOutputBuffer outbuffer) {
+        protected OutputStream createOutputStream(long len, SessionOutputBuffer outBuffer) {
             if (len == ContentLengthStrategy.CHUNKED) {
-                return new ChunkedOutputStream(chunkSize, outbuffer);
+                return new ChunkedOutputStream(chunkSize, outBuffer);
             }
-            return super.createOutputStream(len, outbuffer);
+            return super.createOutputStream(len, outBuffer);
         }
     }
 }
diff --git a/bitrepository-core/src/main/java/org/bitrepository/common/ArgumentValidator.java b/bitrepository-core/src/main/java/org/bitrepository/common/ArgumentValidator.java
index 0294c7771..a39959706 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/common/ArgumentValidator.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/common/ArgumentValidator.java
@@ -1,23 +1,23 @@
 /*
  * #%L
  * Bitrepository Common
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -26,14 +26,10 @@
 
 import java.util.Collection;
 
-/**
- * Indicates that one or more arguments are invalid.
- */
 public final class ArgumentValidator {
-    
-    /** Utility class, should never be instantiated */
-    private ArgumentValidator() {}
-    
+    private ArgumentValidator() {
+    }
+
     /**
      * Check if a String argument is null or the empty string.
      *
@@ -79,7 +75,7 @@ public static void checkNotNegative(int num, String name) {
     /**
      * Check if a long argument is less than 0.
      *
-     * @param num argument to check
+     * @param num  argument to check
      * @param name the name and type of the value being checked.
      * @throws IllegalArgumentException if validation fails
      */
@@ -107,7 +103,7 @@ public static void checkPositive(int num, String name) {
     /**
      * Check if a long argument is less than 0.
      *
-     * @param num argument to check
+     * @param num  argument to check
      * @param name the name and type of the value being checked.
      * @throws IllegalArgumentException if validation fails
      */
@@ -121,7 +117,7 @@ public static void checkPositive(long num, String name) {
     /**
      * Check if a List argument is not null and the list is not empty.
      *
-     * @param c argument to check
+     * @param c    argument to check
      * @param name the name and type of the value being checked.
      * @throws IllegalArgumentException if validation fails
      */
@@ -132,12 +128,12 @@ public static void checkNotNullOrEmpty(Collection<?> c, String name) {
             throw new IllegalArgumentException("The contents of the argument '" + name + "' must not be empty.");
         }
     }
-    
+
     /**
      * Check if a array argument is not null and the list is not empty.
      *
      * @param array argument to check
-     * @param name the name and type of the value being checked.
+     * @param name  the name and type of the value being checked.
      * @throws IllegalArgumentException if validation fails
      */
     public static void checkNotNullOrEmpty(Object[] array, String name) {
@@ -151,6 +147,7 @@ public static void checkNotNullOrEmpty(Object[] array, String name) {
     /**
      * Check that some condition on input parameters is true and throw an
      * ArgumentNotValid if it is false.
+     *
      * @param b the condition to check
      * @param s the error message to be reported
      * @throws IllegalArgumentException if validation fails
diff --git a/bitrepository-core/src/main/java/org/bitrepository/common/DefaultThreadFactory.java b/bitrepository-core/src/main/java/org/bitrepository/common/DefaultThreadFactory.java
index fe4ebc4e2..eb42943d1 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/common/DefaultThreadFactory.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/common/DefaultThreadFactory.java
@@ -8,12 +8,12 @@
  * it under the terms of the GNU Lesser General Public License as
  * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
@@ -21,19 +21,20 @@
  */
 package org.bitrepository.common;
 
-import java.util.concurrent.ThreadFactory;
-
+import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.concurrent.ThreadFactory;
+
 /**
  * Creates thread for executors enforcing the general bit repository guidelines. These include<ul>
- *     <li>Setting thread priority factory configured value.</li>
- *     <li>Setting the thread name to the indicated prefix + a counter indentifying the number of threads created by
- *     this factory.</li>
- *     <li>Adds a error handler logging to the bit repository logger.</li>
- *     <li>Marks the thread as daemon thread.</li>
- *     </ul>
+ * <li>Setting thread priority factory configured value.</li>
+ * <li>Setting the thread name to the indicated prefix + a counter identifying the number of threads created by
+ * this factory.</li>
+ * <li>Adds a error handler logging to the bit repository logger.</li>
+ * <li>Marks the thread as daemon thread.</li>
+ * </ul>
  */
 public class DefaultThreadFactory implements ThreadFactory {
     private final String prefix;
@@ -54,17 +55,14 @@ public DefaultThreadFactory(String prefix, int priority, boolean daemonic) {
     }
 
     @Override
-    public synchronized Thread newThread(Runnable r) {
-        Thread newThread = new Thread(r, prefix + "-Thread" +counter);
+    public synchronized Thread newThread(@NotNull Runnable runnable) {
+        Thread newThread = new Thread(runnable, prefix + "-Thread" + counter);
         newThread.setPriority(priority);
         newThread.setDaemon(daemonic);
-        newThread.setUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
-            @Override
-            public void uncaughtException(Thread thread, Throwable throwable) {
-                String throwingClass = throwable.getStackTrace()[0].getClassName();
-                Logger logger = LoggerFactory.getLogger(throwingClass);
-                logger.error("UncaughtExceptionHandler caught Exception:", throwable);
-            }
+        newThread.setUncaughtExceptionHandler((thread, throwable) -> {
+            String throwingClass = throwable.getStackTrace()[0].getClassName();
+            Logger logger = LoggerFactory.getLogger(throwingClass);
+            logger.error("UncaughtExceptionHandler caught Exception:", throwable);
         });
         counter++;
         return newThread;
diff --git a/bitrepository-core/src/main/java/org/bitrepository/common/JaxbHelper.java b/bitrepository-core/src/main/java/org/bitrepository/common/JaxbHelper.java
index 3c2fbe464..c47178b31 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/common/JaxbHelper.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/common/JaxbHelper.java
@@ -1,36 +1,35 @@
 /*
  * #%L
  * bitrepository-common
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.common;
 
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Reader;
-import java.io.UnsupportedEncodingException;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.ls.LSInput;
+import org.w3c.dom.ls.LSResourceResolver;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
 
 import javax.xml.XMLConstants;
 import javax.xml.bind.JAXBContext;
@@ -40,13 +39,13 @@
 import javax.xml.validation.Schema;
 import javax.xml.validation.SchemaFactory;
 import javax.xml.validation.Validator;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.w3c.dom.ls.LSInput;
-import org.w3c.dom.ls.LSResourceResolver;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Reader;
+import java.io.UnsupportedEncodingException;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
 
 /**
  * Provides extra JAXB related utilities
@@ -54,22 +53,22 @@
  */
 public final class JaxbHelper {
     private final Logger log = LoggerFactory.getLogger(getClass());
-
     private final Schema schema;
-    
+
     /**
      * Used for creating a JaxbHelper instance for a specific schema.
+     *
      * @param pathToSchema The location of the schema in the classpath.
-     * @param schemaName The name of the schema to use.
+     * @param schemaName   The name of the schema to use.
      */
     public JaxbHelper(String pathToSchema, String schemaName) {
         ArgumentValidator.checkNotNullOrEmpty(schemaName, "schemaName");
-        if(pathToSchema == null) {
+        if (pathToSchema == null) {
             pathToSchema = "";
         }
 
         InputStream schemaStream = Thread.currentThread().getContextClassLoader().getResourceAsStream(pathToSchema + schemaName);
-        log.debug("Creating JAXBHelper based on schema from: " + 
+        log.debug("Creating JAXBHelper based on schema from: " +
                 Thread.currentThread().getContextClassLoader().getResource(pathToSchema + schemaName));
         LSResourceResolver resourceResolver = new ResourceResolver(pathToSchema);
         SchemaFactory schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
@@ -80,14 +79,15 @@ public JaxbHelper(String pathToSchema, String schemaName) {
             throw new IllegalArgumentException("Unable to parse schema " + schemaName, e);
         }
     }
-    
+
     /**
      * Uses JAXB to create a object representation of an xml file. The class used to load the XML has been generated
      * based on the xsd for the xml.
-     * @param <T> The root class to deserialize to.
-     * @param xmlroot The root class to deserialize to.
+     *
+     * @param <T>         The root class to deserialize to.
+     * @param xmlroot     The root class to deserialize to.
      * @param inputStream The input stream containing the xml data.
-     * @return Returns a new object representation of the xml data. 
+     * @return Returns a new object representation of the xml data.
      * @throws JAXBException The attempt to load the xml into a new object representation failed.
      */
     public <T> T loadXml(Class<T> xmlroot, InputStream inputStream) throws JAXBException {
@@ -99,10 +99,11 @@ public <T> T loadXml(Class<T> xmlroot, InputStream inputStream) throws JAXBExcep
     }
 
     /**
-     * Validates the xml in the inputstream
+     * Validates the xml in the input-stream
+     *
      * @param inputStream The stream containing the xml to validate
      * @throws SAXException The xml didn't validate.
-     * @throws IOException Problems accessing the input stream.
+     * @throws IOException  Problems accessing the input stream.
      */
     public void validate(InputStream inputStream) throws SAXException, IOException {
         Validator schemaValidator = schema.newValidator();
@@ -111,6 +112,7 @@ public void validate(InputStream inputStream) throws SAXException, IOException {
 
     /**
      * Method for retrieving the content of a JAXB object as a string.
+     *
      * @param object The xml-serializable object which should be made into XML.
      * @return The XML representation of the message object.
      * @throws JAXBException If the object could not be serialized as a JAXB object.
@@ -136,12 +138,12 @@ public ResourceResolver(String prefix) {
 
         @Override
         public LSInput resolveResource(String type, String namespaceURI, String publicId, String systemId,
-                String baseURI) {
+                                       String baseURI) {
             //The key here is SystemID.
             if (systemId == null) {
                 return null;
             }
-            
+
             URL schema = Thread.currentThread().getContextClassLoader().getResource(prefix + systemId);
             LSInput input = new MyLSInput(schema);
             input.setBaseURI(baseURI);
@@ -242,6 +244,6 @@ public boolean getCertifiedText() {
             public void setCertifiedText(boolean certifiedText) {
                 //To change body of implemented methods use File | Settings | File Templates.
             }
-        };
+        }
     }
 }
diff --git a/bitrepository-core/src/main/java/org/bitrepository/common/exceptions/OperationFailedException.java b/bitrepository-core/src/main/java/org/bitrepository/common/exceptions/OperationFailedException.java
index 0f47fc2fd..077cc406e 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/common/exceptions/OperationFailedException.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/common/exceptions/OperationFailedException.java
@@ -1,23 +1,23 @@
 /*
  * #%L
  * Bitrepository Common
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
diff --git a/bitrepository-core/src/main/java/org/bitrepository/common/exceptions/UnableToFinishException.java b/bitrepository-core/src/main/java/org/bitrepository/common/exceptions/UnableToFinishException.java
index c60a8fce6..bc85b406c 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/common/exceptions/UnableToFinishException.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/common/exceptions/UnableToFinishException.java
@@ -1,23 +1,23 @@
 /*
  * #%L
  * Bitrepository Common
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -26,8 +26,8 @@
 
 /**
  * Indicates a failure to finish a task. <p>
- * 
- * An example would be a failure to handle of a set of responses to reach a well defined finish state.
+ * <p>
+ * An example would be a failure to handle of a set of responses to reach a well-defined finish state.
  */
 @SuppressWarnings("serial")
 public class UnableToFinishException extends Exception {
diff --git a/bitrepository-core/src/main/java/org/bitrepository/common/filestore/DefaultFileInfo.java b/bitrepository-core/src/main/java/org/bitrepository/common/filestore/DefaultFileInfo.java
index 633251c85..6b84c8f57 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/common/filestore/DefaultFileInfo.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/common/filestore/DefaultFileInfo.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2013 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -30,40 +30,32 @@
  * File info for the files of a default file system.
  */
 public class DefaultFileInfo implements FileInfo {
-    /** The file with the info.*/
     private final File file;
-    
-    /**
-     * Constructor.
-     * @param file The file for the file info.
-     */
+
     public DefaultFileInfo(File file) {
         this.file = file;
     }
-    
+
     @Override
     public String getFileID() {
         return file.getName();
     }
-    
+
     @Override
-    public InputStream getInputstream() throws IOException {
+    public InputStream getInputStream() throws IOException {
         return new FileInputStream(file);
     }
-    
+
     @Override
     public Long getLastModifiedDate() {
         return file.lastModified();
     }
-    
+
     @Override
     public long getSize() {
         return file.length();
     }
-    
-    /**
-     * @return The file.
-     */
+
     public File getFile() {
         return file;
     }
diff --git a/bitrepository-core/src/main/java/org/bitrepository/common/filestore/FileInfo.java b/bitrepository-core/src/main/java/org/bitrepository/common/filestore/FileInfo.java
index d81508537..25435712a 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/common/filestore/FileInfo.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/common/filestore/FileInfo.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2013 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -24,28 +24,12 @@
 import java.io.IOException;
 import java.io.InputStream;
 
-/**
- * Interface for the information attached to a given file id.
- */
 public interface FileInfo {
-    /**
-     * @return The ID of the file.
-     */
     String getFileID();
 
-    /**
-     * @return The inputstream for the data.
-     * @exception IOException If any issues regarding retrieving the inputstream occurs.
-     */
-    InputStream getInputstream() throws IOException;
-    
-    /**
-     * @return The last modified timestamp.
-     */
+    InputStream getInputStream() throws IOException;
+
     Long getLastModifiedDate();
-    
-    /**
-     * @return The size of the file.
-     */
+
     long getSize();
 }
diff --git a/bitrepository-core/src/main/java/org/bitrepository/common/filestore/FileStore.java b/bitrepository-core/src/main/java/org/bitrepository/common/filestore/FileStore.java
index c793a6248..761ea26e8 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/common/filestore/FileStore.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/common/filestore/FileStore.java
@@ -1,23 +1,23 @@
 /*
  * #%L
  * Bitrepository Protocol
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -28,21 +28,20 @@
 import java.io.InputStream;
 import java.util.Collection;
 
-/**
- * Interface for the file stores and the reference archive.
- */
 public interface FileStore {
     /**
-     * Retrieves the wanted file.
-     * @param fileID The id of the wanted file.
+     * Retrieves the wanted file info.
+     *
+     * @param fileID       The id of the wanted file.
      * @param collectionID the collection id
      * @return The requested file.
      */
     FileInfo getFileInfo(String fileID, String collectionID);
-    
+
     /**
      * Method to check whether a file already exists.
-     * @param fileID The id of the file.
+     *
+     * @param fileID       The id of the file.
      * @param collectionID the collection id
      * @return Whether it already exists within the archive.
      */
@@ -50,6 +49,7 @@ public interface FileStore {
 
     /**
      * Retrieves id of all the files within the storage.
+     *
      * @param collectionID the collection id
      * @return The collection of file ids in the storage.
      * @throws RuntimeException If anything unexpected occurs.
@@ -57,20 +57,22 @@ public interface FileStore {
     Collection<String> getAllFileIds(String collectionID);
 
     /**
-     * Stores a file given through an InputStream. The file is only intended to be stored in a temporary zone until it 
+     * Stores a file given through an InputStream. The file is only intended to be stored in a temporary zone until it
      * has been validated. Then it should be archived through the 'moveToArchive' method.
-     * @param fileID The id of the file to store.
+     *
+     * @param fileID       The id of the file to store.
      * @param collectionID the collection id
-     * @param inputStream The InputStream with the content of the file.
+     * @param inputStream  The InputStream with the content of the file.
      * @return The downloaded file, which should be validated before it is moved to the archive.
      * @throws IOException If anything unexpected occurs (e.g. file already exists, not enough space, etc.)
-     * @see #moveToArchive(String,String)
+     * @see #moveToArchive(String, String)
      */
     FileInfo downloadFileForValidation(String fileID, String collectionID, InputStream inputStream) throws IOException;
-    
+
     /**
      * Moves a file from the temporary file zone to the archive.
-     * @param fileID The id of the file to move to archive.
+     *
+     * @param fileID       The id of the file to move to archive.
      * @param collectionID the collection id
      * @throws RuntimeException If anything unexpected occurs (e.g. file already exists, not enough space, etc.)
      * @see #downloadFileForValidation(String, String, InputStream)
@@ -79,44 +81,47 @@ public interface FileStore {
 
     /**
      * Removes a file from the storage area.
-     * @param fileID The id of the file to remove.
+     *
+     * @param fileID       The id of the file to remove.
      * @param collectionID the collection id
      * @throws RuntimeException If anything unexpected occurs (e.g. no such file).
      */
     void deleteFile(String fileID, String collectionID);
-    
+
     /**
      * The replace operation atomically.
      * Removes the archived file from its directory, and moves the tmpFile into the archive dir.
-     * 
-     * @param fileID The id of the file to perform the replace function upon.
+     *
+     * @param fileID       The id of the file to perform the replace function upon.
      * @param collectionID the collection id
      */
     void replaceFile(String fileID, String collectionID);
-    
+
     /**
      * For retrieval of the size left in this archive.
+     *
      * @param collectionID the collection id
      * @return The number of bytes left in the archive.
      */
     long sizeLeftInArchive(String collectionID);
-    
+
     /**
      * Retrieves the file within a tmpDir.
-     * @param fileID The id of the file to locate within the tmpDir.
+     *
+     * @param fileID       The id of the file to locate within the tmpDir.
      * @param collectionID the collection id
      * @return The file in the tmpDir.
      */
     FileInfo getFileInTmpDir(String fileID, String collectionID);
-    
+
     /**
      * Ensures that no such file exists within the tmp directory.
-     * 
-     * @param fileID The id of the file to clean up after.
+     *
+     * @param fileID       The id of the file to clean up after.
      * @param collectionID the collection for the fileID
      */
     void ensureFileNotInTmpDir(String fileID, String collectionID);
-    
+
     /**
      * Closes all the archives.
      */
diff --git a/bitrepository-core/src/main/java/org/bitrepository/common/package-info.java b/bitrepository-core/src/main/java/org/bitrepository/common/package-info.java
index a789bd5b6..ea38f1b46 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/common/package-info.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/common/package-info.java
@@ -1,31 +1,31 @@
 /*
  * #%L
- * bitrepository-common
- * 
+ * BitRepository-common
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 /**
- * The Commons module contains the functionality used across all the Bitrepository modules.<p>
- * 
- * The functionality here is restricted to common software technical utility and helper code, and does note contain any 
+ * The common module contains the functionality used across all the Bitrepository modules.<p>
+ * <p>
+ * The functionality here is restricted to common software technical utility and helper code, and does not contain any
  * Bitrepository business logic.
  */
 package org.bitrepository.common;
\ No newline at end of file
diff --git a/bitrepository-core/src/main/java/org/bitrepository/common/settings/Settings.java b/bitrepository-core/src/main/java/org/bitrepository/common/settings/Settings.java
index adcde1fc3..6bb5ac9bc 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/common/settings/Settings.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/common/settings/Settings.java
@@ -1,40 +1,41 @@
 /*
  * #%L
  * Bitrepository Common
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.common.settings;
 
-import java.util.List;
-
 import org.bitrepository.settings.referencesettings.ReferenceSettings;
 import org.bitrepository.settings.repositorysettings.Collection;
 import org.bitrepository.settings.repositorysettings.MessageBusConfiguration;
 import org.bitrepository.settings.repositorysettings.Permission;
 import org.bitrepository.settings.repositorysettings.RepositorySettings;
 
+import java.util.List;
+
 /**
  * Contains the general configuration to be used by reference code components. Provides access to both
- * {@link ReferenceSettings} and {@link org.bitrepository.settings.repositorysettings.RepositorySettings}. Use a {@link SettingsProvider} to access settings create
+ * {@link ReferenceSettings} and {@link org.bitrepository.settings.repositorysettings.RepositorySettings}. Use a {@link SettingsProvider}
+ * to access settings create
  * <code>Settings</code> objects.
  */
 public class Settings {
@@ -42,12 +43,9 @@ public class Settings {
     protected final String receiverDestinationID;
     protected final ReferenceSettings referenceSettings;
     protected final RepositorySettings repositorySettings;
-    
-    protected Settings(
-            String componentID,
-            String receiverDestinationID,
-            RepositorySettings repositorySettings,
-            ReferenceSettings referenceSettings) {
+
+    protected Settings(String componentID, String receiverDestinationID, RepositorySettings repositorySettings,
+                       ReferenceSettings referenceSettings) {
         this.componentID = componentID;
         this.receiverDestinationID = receiverDestinationID;
 
@@ -56,61 +54,65 @@ protected Settings(
     }
 
     /**
-     * @return the first Collections ID as a list of .
-     * TODO singular vs. plural
+     * @return the first Collections ID as a list.
      */
     public List<Collection> getCollections() {
         return getRepositorySettings().getCollections().getCollection();
     }
-    
+
     /**
      * Wraps the {@link org.bitrepository.settings.repositorysettings.ProtocolSettings#getAlarmDestination()} method.
+     *
      * @return the alarm destination
      */
     public String getAlarmDestination() {
         return getRepositorySettings().getProtocolSettings().getAlarmDestination();
     }
-    
+
     /**
      * Wraps the {@link org.bitrepository.settings.repositorysettings.ProtocolSettings#getCollectionDestination()} method.
+     *
      * @return the collection destination
      */
     public String getCollectionDestination() {
         return getRepositorySettings().getProtocolSettings().getCollectionDestination();
     }
-    
+
     /**
      * Wraps the {@link org.bitrepository.settings.repositorysettings.ProtocolSettings#getMessageBusConfiguration()} method.
+     *
      * @return the message bus configuration
      */
     public MessageBusConfiguration getMessageBusConfiguration() {
         return getRepositorySettings().getProtocolSettings().getMessageBusConfiguration();
     }
-    
+
     /**
      * Wraps the {@link org.bitrepository.settings.repositorysettings.PermissionSet#getPermission()}} method.
+     *
      * @return the list of Permissions
      */
     public List<Permission> getPermissions() {
         return getRepositorySettings().getPermissionSet().getPermission();
     }
-    
+
     /**
      * Wraps the {@link org.bitrepository.settings.repositorysettings.ClientSettings#getIdentificationTimeout()} method.
+     *
      * @return the timeout
      * @see org.bitrepository.settings.repositorysettings.ClientSettings#getIdentificationTimeout()
      */
     public long getIdentificationTimeout() {
         return getRepositorySettings().getClientSettings().getIdentificationTimeout().longValue();
     }
-      
+
     /**
      * @return The settings specific to the reference code for a collection.
      */
     public ReferenceSettings getReferenceSettings() {
         return referenceSettings;
     }
-    
+
     /**
      * @return The standard settings for a collection.
      */
diff --git a/bitrepository-core/src/main/java/org/bitrepository/common/settings/SettingsLoader.java b/bitrepository-core/src/main/java/org/bitrepository/common/settings/SettingsLoader.java
index 3a9e88e15..c72edbc79 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/common/settings/SettingsLoader.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/common/settings/SettingsLoader.java
@@ -1,23 +1,23 @@
 /*
  * #%L
  * Bitrepository Protocol
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -30,9 +30,10 @@
 public interface SettingsLoader {
     /**
      * Loads the settings for the indicated collection
-     * @param <T> the Type of settings
+     *
+     * @param <T>                the Type of settings
      * @param configurationClass Specifies the type of settings to load.
      * @return The loaded settings.
      */
-    public <T> T loadSettings(Class<T> configurationClass);
+    <T> T loadSettings(Class<T> configurationClass);
 }
diff --git a/bitrepository-core/src/main/java/org/bitrepository/common/settings/SettingsProvider.java b/bitrepository-core/src/main/java/org/bitrepository/common/settings/SettingsProvider.java
index 0b5e7dca4..5ea309d11 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/common/settings/SettingsProvider.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/common/settings/SettingsProvider.java
@@ -1,23 +1,23 @@
 /*
  * #%L
  * Bitrepository Protocol
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -32,22 +32,23 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * Used for accessing <code>Settings</code> objects. A <code>SettingsLoader</code> needs to be provides on 
+ * Used for accessing {@link Settings} objects.
+ * <p/>
+ * A {@link SettingsLoader} needs to be provides on
  * instantiation for loading stored settings.
  */
 public class SettingsProvider {
     private final Logger log = LoggerFactory.getLogger(getClass());
-    /** The loader to use for accessing stored settings*/
     private final SettingsLoader settingsReader;
-    /** The loaded settings */
     private Settings settings;
-    private String componentID;
+    private final String componentID;
 
     /**
-     * Creates a <code>SettingsProvider</code> which will use the provided <code>SettingsLoader</code> for loading the 
+     * Creates a <code>SettingsProvider</code> which will use the provided <code>SettingsLoader</code> for loading the
      * settings.
+     *
      * @param settingsReader Use for loading the settings.
-     * @param componentID The componentID to use for these settings
+     * @param componentID    The componentID to use for these settings
      */
     public SettingsProvider(SettingsLoader settingsReader, String componentID) {
         this.settingsReader = settingsReader;
@@ -56,10 +57,11 @@ public SettingsProvider(SettingsLoader settingsReader, String componentID) {
 
     /**
      * Gets the settings, if no settings has been loaded into memory, will load the settings from disk
-     * @return The settings 
+     *
+     * @return The settings
      */
     public synchronized Settings getSettings() {
-        if(settings == null) {
+        if (settings == null) {
             reloadSettings();
             SettingsUtils.initialize(settings);
         }
@@ -76,10 +78,10 @@ public synchronized void reloadSettings() {
 
             String componentID = getComponentID(referenceSettings);
             String receiverDestination = getReceiverDestination(referenceSettings, repositorySettings);
-            
+
             settings = new Settings(componentID, receiverDestination, repositorySettings, referenceSettings);
         } catch (RuntimeException re) {
-            // We need to ensure this is log, as the method caller may not have implemented a fault barrier and this
+            // We need to ensure this is logged, as the method caller may not have implemented a fault barrier and this
             // exception is properly fatal.
             log.error("Failed to load settings", re);
             throw re;
@@ -88,16 +90,18 @@ public synchronized void reloadSettings() {
 
     /**
      * Provides extension point for subclass componentID generation.
+     *
      * @param referenceSettings the reference settings
      * @return generate ComponentID
      */
     protected String getComponentID(ReferenceSettings referenceSettings) {
         return componentID;
     }
-    
+
     /**
      * Provides extension point for subclass receiver destination generation.
-     * @param referenceSettings the reference settings
+     *
+     * @param referenceSettings  the reference settings
      * @param repositorySettings the repository settings
      * @return generate receiver destination
      */
@@ -107,7 +111,7 @@ protected String getReceiverDestination(ReferenceSettings referenceSettings, Rep
             receiverDestinationIDFactoryClass =
                     referenceSettings.getGeneralSettings().getReceiverDestinationIDFactoryClass();
         }
-        
+
         DestinationHelper dh = new DestinationHelper(
                 getComponentID(referenceSettings),
                 receiverDestinationIDFactoryClass,
diff --git a/bitrepository-core/src/main/java/org/bitrepository/common/settings/XMLFileSettingsLoader.java b/bitrepository-core/src/main/java/org/bitrepository/common/settings/XMLFileSettingsLoader.java
index 66af399b7..74d366b23 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/common/settings/XMLFileSettingsLoader.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/common/settings/XMLFileSettingsLoader.java
@@ -1,63 +1,53 @@
 /*
  * #%L
  * Bitrepository Protocol
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.common.settings;
 
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-
 import org.bitrepository.common.JaxbHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.xml.sax.SAXException;
 
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+
 /**
  * Loads settings as xml from the classpath.
- *
  */
 public class XMLFileSettingsLoader implements SettingsLoader {
-    /** The log for this class. */
     private final Logger log = LoggerFactory.getLogger(getClass());
-
-    private String pathToSettingsFiles;
-
-    /** Directory seperator constant */
+    private final String pathToSettingsFiles;
     private static final String DIRECTORY_SEPERATOR = "/";
-    /** xml file extension constant */
     private static final String XML_FILE_EXTENSION = ".xml";
-    /** xsd file extension constant */
     private static final String XSD_FILE_EXTENSION = ".xsd";
-    /** xsd schema directory constant */
     private static final String XSD_SCHEMA_DIR = "xsd/";
 
     /**
-     * Creates a new loader
-     * @param pathToSettingsFiles The location of the files to load. The settings xml files are assume to be placed as
-     * ${CONFIGURATION_CLASS}.xml under this directory.
-     *
+     * @param pathToSettingsFiles The location of the files to load. The settings xml files are assumed to be placed as
+     *                            ${CONFIGURATION_CLASS}.xml under this directory.
      */
     public XMLFileSettingsLoader(String pathToSettingsFiles) {
         this.pathToSettingsFiles = pathToSettingsFiles;
@@ -65,8 +55,9 @@ public XMLFileSettingsLoader(String pathToSettingsFiles) {
 
     /**
      * Loads the indicated settings for the specified collection.
+     *
      * @param settingsClass The settings class identifying the type of settings requested.
-     * @param <T> The type of settings to return
+     * @param <T>           The type of settings to return
      * @return The loaded settings.
      */
     public <T> T loadSettings(Class<T> settingsClass) {
@@ -106,7 +97,7 @@ public <T> T loadSettings(Class<T> settingsClass) {
                 if (configStreamLoad != null) configStreamLoad.close();
                 if (configStreamValidate != null) configStreamValidate.close();
             } catch (IOException e) {
-                throw new RuntimeException("Unable to close inputstream", e);
+                throw new RuntimeException("Unable to close input-stream", e);
             }
         }
     }
diff --git a/bitrepository-core/src/main/java/org/bitrepository/common/utils/Base16Utils.java b/bitrepository-core/src/main/java/org/bitrepository/common/utils/Base16Utils.java
index 82e1bfb71..7c3586728 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/common/utils/Base16Utils.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/common/utils/Base16Utils.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -27,48 +27,47 @@
  * Utility class for handling encoding and decoding of base16 bytes.
  */
 public class Base16Utils {
+    private Base16Utils() {
+    }
+
     /**
-     * Private constructor to prevent instantiation of this utility class.
-     */
-    private Base16Utils() {}
-    
-    /**
-     * Decodes a base16 encoded byte set into a human readable string.
+     * Decodes a base16 encoded byte set into a human-readable string.
+     *
      * @param data The data to decode.
      * @return The decoded data, or null if a null is given.
      */
     public static String decodeBase16(byte[] data) {
-        if(data == null) {
+        if (data == null) {
             return null;
         }
-        
-        StringBuffer sb = new StringBuffer(data.length * 2);
-        for (int i = 0; i < data.length; i++){
-          int v = data[i] & 0xff;
-          if (v < 16) {
-            sb.append('0');
-          }
-          sb.append(Integer.toHexString(v));
+
+        StringBuilder sb = new StringBuilder(data.length * 2);
+        for (byte datum : data) {
+            int v = datum & 0xff;
+            if (v < 16) {
+                sb.append('0');
+            }
+            sb.append(Integer.toHexString(v));
         }
         return sb.toString();
     }
-    
+
     /**
      * Encoding a hex string to base16.
-     * 
+     *
      * @param hexString The string to encode to base16.
      * @return The string encoded to base16.
      */
     public static byte[] encodeBase16(String hexString) {
         ArgumentValidator.checkNotNullOrEmpty(hexString, "String hexString");
-        ArgumentValidator.checkTrue((hexString.length() % 2) == 0, "String hexString, '" + hexString 
+        ArgumentValidator.checkTrue((hexString.length() % 2) == 0, "String hexString, '" + hexString
                 + "', must be an even number of characters.");
-        
+
         int len = hexString.length();
         byte[] data = new byte[len / 2];
         for (int i = 0; i < len; i += 2) {
             data[i / 2] = (byte) ((Character.digit(hexString.charAt(i), 16) << 4)
-                                 + Character.digit(hexString.charAt(i+1), 16));
+                    + Character.digit(hexString.charAt(i + 1), 16));
         }
         return data;
     }
diff --git a/bitrepository-core/src/main/java/org/bitrepository/common/utils/CalendarUtils.java b/bitrepository-core/src/main/java/org/bitrepository/common/utils/CalendarUtils.java
index 9226b701e..216887426 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/common/utils/CalendarUtils.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/common/utils/CalendarUtils.java
@@ -1,23 +1,23 @@
 /*
  * #%L
  * Bitrepository Modifying Client
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -40,46 +40,45 @@
 import java.util.function.Consumer;
 
 /**
- * Utility class for calendar issues. 
+ * Utility class for calendar issues.
  */
 public final class CalendarUtils {
-    /** The log.*/
     private static final Logger log = LoggerFactory.getLogger(CalendarUtils.class);
     private TimeZone localTimeZone = TimeZone.getDefault();
-    
-    /**
-     * Private constructor to prevent instantiation of utility class.
-     */
-    private CalendarUtils() { }
-    
+
+    private CalendarUtils() {
+    }
+
     /**
      * Get an instance of CalendarUtils with a non-server default timezone
+     *
      * @param timezone The TimeZone to use
-     * @return The CelandarUtils instance for the non-standard timezone 
+     * @return The CelandarUtils instance for the non-standard timezone
      */
     public static CalendarUtils getInstance(TimeZone timezone) {
         CalendarUtils cu = new CalendarUtils();
         cu.setTimeZone(timezone);
         return cu;
     }
-    
+
     private void setTimeZone(TimeZone timezone) {
         log.info("Using timezone: '{}'", timezone);
         this.localTimeZone = timezone;
     }
-    
-    
+
+
     /**
      * Turns a date into a XMLGregorianCalendar.
+     *
      * @param date The date. If the argument is null, then epoch is returned.
      * @return The XMLGregorianCalendar.
      */
     public static XMLGregorianCalendar getXmlGregorianCalendar(Date date) {
-        if(date == null) {
+        if (date == null) {
             log.debug("Cannot convert the date '" + date + "'. Returning epoch instead.");
             date = new Date(0);
         }
-        
+
         GregorianCalendar gc = new GregorianCalendar(TimeZone.getDefault(), Locale.ROOT);
         try {
             gc.setTime(date);
@@ -91,6 +90,7 @@ public static XMLGregorianCalendar getXmlGregorianCalendar(Date date) {
 
     /**
      * Method for easier retrieving the current date in XML format.
+     *
      * @param gregorianCalendar the calendar
      * @return The current date in XML format
      */
@@ -104,101 +104,108 @@ public static XMLGregorianCalendar getXmlGregorianCalendar(GregorianCalendar gre
 
     /**
      * Method for easier retrieving the current date in XML format.
+     *
      * @return The current date in XML format
      */
     public static XMLGregorianCalendar getNow() {
         return getXmlGregorianCalendar(new Date());
     }
-    
+
     /**
      * Method for easier retrieving the date for Epoch (January 1, 1970 00:00:00.000 GMT).
+     *
      * @return Epoch in XMLGregorianCalendar format.
      */
     public static XMLGregorianCalendar getEpoch() {
         return getXmlGregorianCalendar(new Date(0));
     }
-    
+
     /**
      * Method for easier retrieving the Date for a given time since Epoch in millis.
+     *
      * @param millis The amount of milliseconds since Epoch.
      * @return The date in XMLGregorianCalendar format.
      */
     public static XMLGregorianCalendar getFromMillis(long millis) {
         return getXmlGregorianCalendar(new Date(millis));
     }
-    
+
     /**
      * Method for converting a date from the XML calendar type 'XMLGregorianCalendar' to the default java date.
-     * 
+     *
      * @param xmlCal The XML calendar to convert from.
      * @return The date for the XML calendar converted into the default java date class.
      */
     public static Date convertFromXMLGregorianCalendar(XMLGregorianCalendar xmlCal) {
         ArgumentValidator.checkNotNull(xmlCal, "XMLGregorianCalendar xmlCal");
-        
+
         return xmlCal.toGregorianCalendar().getTime();
     }
-    
+
     /**
      * Create a date object representing the start of the day denoted by dateStr
+     *
      * @param dateStr The string representation of the date, in the form '02/26/2015'
      * @return Date A date object representing the start of the day, or null if the input cannot
-     *         be turned into a date. 
+     * be turned into a date.
      */
     public Date makeStartDateObject(String dateStr) {
-        Consumer<Calendar> dateAdjuster = (Calendar calendar) -> {};
-        
+        Consumer<Calendar> dateAdjuster = (Calendar calendar) -> {
+        };
+
         Calendar cal = makeCalendarObject(dateStr, dateAdjuster);
-        if(cal == null) {
+        if (cal == null) {
             return null;
         } else {
             return cal.getTime();
         }
     }
-    
+
     /**
      * Create a date object representing the end of the day denoted by dateStr
+     *
      * @param dateStr The string representation of the date, in the form '02/26/2015'
      * @return Date A date object representing the end of the day, or null if the input cannot
-     *         be turned into a date. 
+     * be turned into a date.
      */
     public Date makeEndDateObject(String dateStr) {
-        Consumer<Calendar> dateAdjuster = (Calendar calendar)  -> { 
+        Consumer<Calendar> dateAdjuster = (Calendar calendar) -> {
             calendar.add(Calendar.DAY_OF_MONTH, 1);
-            calendar.add(Calendar.MILLISECOND, -1); 
+            calendar.add(Calendar.MILLISECOND, -1);
         };
-        
+
         Calendar cal = makeCalendarObject(dateStr, dateAdjuster);
-        if(cal == null) {
+        if (cal == null) {
             return null;
         } else {
             return cal.getTime();
         }
-    } 
-    
+    }
+
     /**
-     * Parses the input string and returns a calendar representation of the day in UTC. 
-     * @param dateStr The string representation of the date, in the form '2015/02/26' 
-     * @return Calendar A calendar object representing the start of the date in UTC, 
-     *         or null if the input cannot be parsed.
+     * Parses the input string and returns a calendar representation of the day in UTC.
+     *
+     * @param dateStr The string representation of the date, in the form '2015/02/26'
+     * @return Calendar A calendar object representing the start of the date in UTC,
+     * or null if the input cannot be parsed.
      */
     private Calendar makeCalendarObject(String dateStr, Consumer<Calendar> dateAdjust) {
-        if(dateStr == null || dateStr.trim().isEmpty()) {
+        if (dateStr == null || dateStr.trim().isEmpty()) {
             return null;
         } else {
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd", Locale.ROOT);
             sdf.setTimeZone(localTimeZone);
             try {
-                Date basedate = sdf.parse(dateStr);
+                Date baseDate = sdf.parse(dateStr);
                 Calendar time = Calendar.getInstance(localTimeZone, Locale.ROOT);
-                time.setTime(basedate);
+                time.setTime(baseDate);
                 dateAdjust.accept(time);
                 return time;
             } catch (ParseException e) {
                 log.warn("Received something that could not be parsed: '{}'", dateStr, e);
                 return null;
-            } 
+            }
         }
     }
-        
+
 }
diff --git a/bitrepository-core/src/main/java/org/bitrepository/common/utils/ChecksumUtils.java b/bitrepository-core/src/main/java/org/bitrepository/common/utils/ChecksumUtils.java
index 5ddd4300f..bd8c1a939 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/common/utils/ChecksumUtils.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/common/utils/ChecksumUtils.java
@@ -1,29 +1,38 @@
 /*
  * #%L
  * Bitrepository Modifying Client
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.common.utils;
 
+import org.bitrepository.bitrepositoryelements.ChecksumDataForFileTYPE;
+import org.bitrepository.bitrepositoryelements.ChecksumSpecTYPE;
+import org.bitrepository.bitrepositoryelements.ChecksumType;
+import org.bitrepository.common.filestore.FileInfo;
+import org.bitrepository.common.settings.Settings;
+import org.bitrepository.protocol.CoordinationLayerException;
+
+import javax.crypto.Mac;
+import javax.crypto.spec.SecretKeySpec;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -31,36 +40,23 @@
 import java.security.Key;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
-
-import javax.crypto.Mac;
-import javax.crypto.spec.SecretKeySpec;
-
-import org.bitrepository.bitrepositoryelements.ChecksumDataForFileTYPE;
-import org.bitrepository.bitrepositoryelements.ChecksumSpecTYPE;
-import org.bitrepository.bitrepositoryelements.ChecksumType;
-import org.bitrepository.common.filestore.FileInfo;
-import org.bitrepository.common.settings.Settings;
-import org.bitrepository.protocol.CoordinationLayerException;
+import java.util.Arrays;
 
 /**
  * Utility class for handling checksum calculations.
  * Uses the HMAC method for calculating the checksums with salt.
  */
 public final class ChecksumUtils {
-
-    /** The maximal size of the byte array for digest.*/
     private static final int BYTE_ARRAY_SIZE_FOR_DIGEST = 4096;
-    
-    /** 
-     * Private constructor. To prevent instantiation of this utility class.
-     */
-    private ChecksumUtils() { }
-    
+
+    private ChecksumUtils() {
+    }
+
     /**
-     * Calculates the checksum for a file based on the given checksum algorith, where the calculcation is salted.
-     * 
-     * @param file The file to calculate the checksum for.
-     * @param csSpec The checksum specification for the calculation of the checksum. 
+     * Computes the checksum for a file based on the given checksum algorithm, where the computation is salted.
+     *
+     * @param file   The file to calculate the checksum for.
+     * @param csSpec The checksum specification for the calculation of the checksum.
      * @return The checksum of the file in hexadecimal.
      */
     public static String generateChecksum(File file, ChecksumSpecTYPE csSpec) {
@@ -71,17 +67,17 @@ public static String generateChecksum(File file, ChecksumSpecTYPE csSpec) {
                     + file.getAbsolutePath() + "'.", e);
         }
     }
-    
+
     /**
-     * Calculates the checksum for a file based on the given checksum algorithm, where the calculation is salted.
-     * 
+     * Computes the checksum for a file based on the given checksum algorithm, where the computation is salted.
+     *
      * @param fileInfo The file to calculate the checksum for.
-     * @param csSpec The checksum specification for the calculation of the checksum. 
+     * @param csSpec   The checksum specification for the calculation of the checksum.
      * @return The checksum of the file in hexadecimal.
      */
     public static String generateChecksum(FileInfo fileInfo, ChecksumSpecTYPE csSpec) {
         try {
-            return generateChecksum(fileInfo.getInputstream(), csSpec);
+            return generateChecksum(fileInfo.getInputStream(), csSpec);
         } catch (IOException e) {
             throw new CoordinationLayerException("Could not calculate the checksum for the file '"
                     + fileInfo.getFileID() + "'.", e);
@@ -89,20 +85,22 @@ public static String generateChecksum(FileInfo fileInfo, ChecksumSpecTYPE csSpec
     }
 
     /**
-     * Wrapper method for the #generateChecksum(File,ChecksumSpecTYPE) method non-salted checksums.
-     * @param file the file to checksum
+     * Wrapper method for the #generateChecksum(File,ChecksumSpecTYPE) method with non-salted checksums.
+     *
+     * @param file         the file to checksum
      * @param checksumType Defines checksum algorithm.
      * @return the checksum as a string
      */
     public static String generateChecksum(File file, ChecksumType checksumType) {
         return generateChecksum(file, checksumType, null);
     }
-    
+
     /**
-     * Calculates the checksum of a file based on algorithm and salt.
-     * @param file The file to calculate the checksum.
+     * Computes the checksum of a file based on algorithm and salt.
+     *
+     * @param file         The file to calculate the checksum.
      * @param checksumType The algorithm of checksum.
-     * @param salt The salt, if the checksum is salted.
+     * @param salt         The salt, if the checksum is salted.
      * @return The checksum of the file.
      */
     public static String generateChecksum(File file, ChecksumType checksumType, byte[] salt) {
@@ -113,59 +111,61 @@ public static String generateChecksum(File file, ChecksumType checksumType, byte
     }
 
     /**
-     * Calculates a checksum of a inputstream based on a checksum-algorithm specification with optional salt.
-     * 
-     * @param content The inputstream for the data to calculate the checksum of.
-     * @param csSpec The algorithm to use for calculation together wih a optional salt. If it is not prefixed with 'Hmac', then it is added.
+     * Computes a checksum from an input-stream based on a checksum-algorithm specification with optional salt.
+     *
+     * @param content The input-stream for the data to calculate the checksum of.
+     * @param csSpec  The algorithm to use for calculation together wih a optional salt. If it is not prefixed with 'Hmac', then it is
+     *                added.
      * @return The HMAC calculated checksum in hexadecimal.
      */
     public static String generateChecksum(InputStream content, ChecksumSpecTYPE csSpec) {
         byte[] digest = null;
         ChecksumType algorithm = csSpec.getChecksumType();
-        
+
         try {
-        	if(requiresSalt(algorithm)) {
-        		if(csSpec.getChecksumSalt() == null || csSpec.getChecksumSalt().length == 0) {
-        			throw new IllegalArgumentException("Cannot perform a HMAC checksum calculation without salt as requested:" 
-        					+ csSpec);
-        		}
-        		digest = calculateChecksumWithHMAC(content, algorithm, csSpec.getChecksumSalt());
-        	} else {
-        		if(csSpec.getChecksumSalt() != null && csSpec.getChecksumSalt().length > 0) {
-        			throw new IllegalArgumentException("Cannot perform a message-digest checksum calculation with salt "
-        					+ "as requested:" + csSpec);
-        		}
-        		digest = calculateChecksumWithMessageDigest(content, algorithm);
-        	}
+            if (requiresSalt(algorithm)) {
+                if (csSpec.getChecksumSalt() == null || csSpec.getChecksumSalt().length == 0) {
+                    throw new IllegalArgumentException("Cannot perform a HMAC checksum calculation without salt as requested:"
+                            + csSpec);
+                }
+                digest = calculateChecksumWithHMAC(content, algorithm, csSpec.getChecksumSalt());
+            } else {
+                if (csSpec.getChecksumSalt() != null && csSpec.getChecksumSalt().length > 0) {
+                    throw new IllegalArgumentException("Cannot perform a message-digest checksum calculation with salt "
+                            + "as requested:" + csSpec);
+                }
+                digest = calculateChecksumWithMessageDigest(content, algorithm);
+            }
         } catch (NoSuchAlgorithmException e) {
-        	throw new IllegalStateException("The checksum algorithm '" + csSpec.getChecksumType().name() 
-        			+ "' is not supported.");        	
+            throw new IllegalStateException("The checksum algorithm '" + csSpec.getChecksumType().name()
+                    + "' is not supported.");
         }
 
         return Base16Utils.decodeBase16(digest);
     }
-    
+
     /**
-     * Calculation of the checksum for a given input stream through the use of message digestion on the checksum 
+     * Computes the checksum for a given input stream through the use of message digestion on the checksum
      * type as algorithm.
-     * 
-     * NOTE: the 'SHA' algorithm need a dash, '-', after the SHA, which is currently not in the org.bitrepository.org.bitrepository.protocol defined
+     * <p>
+     * NOTE: the 'SHA' algorithm need a dash, '-', after the SHA, which is currently not in the org.bitrepository.org.bitrepository
+     * .protocol defined
      * algorithm names.
-     * 
+     *
      * @param content The input stream with the content to calculate the checksum of.
-     * @param csType The type of checksum to calculate, e.g. the algorithm.
+     * @param csType  The type of checksum to calculate, e.g. the algorithm.
      * @return The calculated checksum.
      */
     private static byte[] calculateChecksumWithMessageDigest(InputStream content, ChecksumType csType) {
         byte[] bytes = new byte[BYTE_ARRAY_SIZE_FOR_DIGEST];
         int bytesRead;
-        
+
         try {
             String algorithmName = csType.name();
-            if(algorithmName.startsWith("SHA")) {
+            if (algorithmName.startsWith("SHA")) {
                 algorithmName = algorithmName.replace("SHA", "SHA-");
             }
-            
+
             MessageDigest digester = MessageDigest.getInstance(algorithmName);
             while ((bytesRead = content.read(bytes)) > 0) {
                 digester.update(bytes, 0, bytesRead);
@@ -175,91 +175,93 @@ private static byte[] calculateChecksumWithMessageDigest(InputStream content, Ch
             throw new CoordinationLayerException("Cannot calculate the checksum.", e);
         }
     }
-    
+
     /**
-     * Calculation of the checksum for a given input stream through the use of HMAC based on the checksum type as 
+     * Calculation of the checksum for a given input stream through the use of HMAC based on the checksum type as
      * algorithm and the optional salt.
-     * 
-     * NOTE: the 'HMAC' algorithms need to have the underscore, '_', after the HMAC removed, which is currently in the 
+     * <p>
+     * NOTE: the 'HMAC' algorithms need to have the underscore, '_', after the HMAC removed, which is currently in the
      * org.bitrepository.org.bitrepository.protocol defined algorithm names.
-     * 
+     *
      * @param content The input stream with the content to calculate the checksum of.
-     * @param csType The type of checksum to calculate, e.g. the algorithm.
-     * @param salt The salt for key encrypting the HMAC calculation.
+     * @param csType  The type of checksum to calculate, e.g. the algorithm.
+     * @param salt    The salt for key encrypting the HMAC calculation.
      * @return The calculated checksum.
      */
     private static byte[] calculateChecksumWithHMAC(InputStream content, ChecksumType csType, byte[] salt) {
         byte[] bytes = new byte[BYTE_ARRAY_SIZE_FOR_DIGEST];
         int bytesRead;
         String algorithmName = csType.name().replace("_", "");
-        
+
         try {
             Mac messageAuthenticationCode = Mac.getInstance(algorithmName);
             Key key = new SecretKeySpec(salt, algorithmName);
-            
+
             // digest the content for calculating the checksum.
             messageAuthenticationCode.init(key);
             while ((bytesRead = content.read(bytes)) > 0) {
                 messageAuthenticationCode.update(bytes, 0, bytesRead);
             }
-            
+
             return messageAuthenticationCode.doFinal();
         } catch (Exception e) {
             e.printStackTrace();
-            throw new CoordinationLayerException("Cannot calculate the checksum with algorithm '" + algorithmName 
-                    + "' and salt '" + salt + "'", e);
+            throw new CoordinationLayerException("Cannot calculate the checksum with algorithm '" + algorithmName
+                    + "' and salt '" + Arrays.toString(salt) + "'", e);
         }
     }
-    
+
     /**
-     * This validates both whether the ChecksumType is implemented and whether the salt is put the correct place. 
-     * 
+     * This validates both whether the ChecksumType is implemented and whether the salt is put the correct place.
+     *
      * @param checksumSpec The specification for the checksum calculation to validate.
      * @throws NoSuchAlgorithmException If the algorithm does not exist.
      */
     public static void verifyAlgorithm(ChecksumSpecTYPE checksumSpec) throws NoSuchAlgorithmException {
         ChecksumType algorithm = checksumSpec.getChecksumType();
-        
-        if(requiresSalt(algorithm)) {
-            if(checksumSpec.getChecksumSalt() == null) {
+
+        if (requiresSalt(algorithm)) {
+            if (checksumSpec.getChecksumSalt() == null) {
                 throw new NoSuchAlgorithmException("Cannot perform a HMAC checksum calculation without salt as "
                         + "requested: " + checksumSpec);
             }
         } else {
-            if(checksumSpec.getChecksumSalt() != null && checksumSpec.getChecksumSalt().length > 0) {
+            if (checksumSpec.getChecksumSalt() != null && checksumSpec.getChecksumSalt().length > 0) {
                 throw new NoSuchAlgorithmException("Cannot perform a message-digest checksum calculation with salt "
                         + "as requested: " + checksumSpec);
             }
         }
     }
-    
+
     /**
      * Returns whether the given checksum algorithm requires a salt.
+     *
      * @param algorithm The algorithm to validate.
      * @return Whether it requires a salt.
      * @throws NoSuchAlgorithmException If the algorithm is not supported.
      */
     public static boolean requiresSalt(ChecksumType algorithm) throws NoSuchAlgorithmException {
-        if((algorithm == ChecksumType.MD5) 
+        if ((algorithm == ChecksumType.MD5)
                 || (algorithm == ChecksumType.SHA1)
                 || (algorithm == ChecksumType.SHA256)
                 || (algorithm == ChecksumType.SHA384)
                 || (algorithm == ChecksumType.SHA512)) {
-        	return false;
-        } else if((algorithm == ChecksumType.HMAC_MD5) 
+            return false;
+        } else if ((algorithm == ChecksumType.HMAC_MD5)
                 || (algorithm == ChecksumType.HMAC_SHA1)
                 || (algorithm == ChecksumType.HMAC_SHA256)
                 || (algorithm == ChecksumType.HMAC_SHA384)
                 || (algorithm == ChecksumType.HMAC_SHA512)) {
-        	return true;
+            return true;
         } else {
             throw new NoSuchAlgorithmException("The checksum algorithm '" + algorithm + "' is not supported.");
-        }    	
+        }
     }
-    
+
     /**
      * Creates the ChecksumSpecTYPE for the default value in settings.
      * It is verified that the checksum spec is supported.
+     *
      * @param settings The settings to retrieve the default algorithm from.
      * @return The default checksum spec type from settings.
      */
@@ -267,26 +269,27 @@ public static ChecksumSpecTYPE getDefault(Settings settings) {
         ChecksumSpecTYPE res = new ChecksumSpecTYPE();
         res.setChecksumType(ChecksumType.valueOf(
                 settings.getRepositorySettings().getProtocolSettings().getDefaultChecksumType()));
-        
+
         try {
             verifyAlgorithm(res);
         } catch (NoSuchAlgorithmException e) {
             throw new IllegalArgumentException("The settings contains an invalid default checksum specification.", e);
         }
-        
+
         return res;
     }
 
     /**
      * Checks whether the checksum of two checksum data elements are identical.
+     *
      * @param checksum1 The first checksum data element.
      * @param checksum2 The second checksum data element.
      * @return Whether the checksum data elements are identical.
      */
     public static boolean areEqual(ChecksumDataForFileTYPE checksum1, ChecksumDataForFileTYPE checksum2) {
-        return  (checksum1 == null && checksum2 == null) ||
+        return (checksum1 == null && checksum2 == null) ||
                 ((checksum1 != null && checksum2 != null) &&
-                Base16Utils.decodeBase16(checksum1.getChecksumValue()).equals(
-                Base16Utils.decodeBase16(checksum2.getChecksumValue())));
+                        Base16Utils.decodeBase16(checksum1.getChecksumValue()).equals(
+                                Base16Utils.decodeBase16(checksum2.getChecksumValue())));
     }
 }
diff --git a/bitrepository-core/src/main/java/org/bitrepository/common/utils/FileIDValidator.java b/bitrepository-core/src/main/java/org/bitrepository/common/utils/FileIDValidator.java
index fac2abb27..17ab42287 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/common/utils/FileIDValidator.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/common/utils/FileIDValidator.java
@@ -3,39 +3,42 @@
  * Bitrepository Reference Pillar
  * *
  * $Id: PutFileRequestHandler.java 687 2012-01-09 12:56:47Z ktc $
- * $HeadURL: https://sbforge.org/svn/bitrepository/bitrepository-reference/trunk/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/PutFileRequestHandler.java $
+ * $HeadURL: https://sbforge.org/svn/bitrepository/bitrepository-reference/trunk/bitrepository-reference-pillar/src/main/java/org
+ * /bitrepository/pillar/messagehandler/PutFileRequestHandler.java $
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.common.utils;
 
-import java.util.regex.Pattern;
 import org.bitrepository.bitrepositoryelements.ResponseCode;
 import org.bitrepository.bitrepositoryelements.ResponseInfo;
 import org.bitrepository.common.settings.Settings;
 
+import java.util.regex.Pattern;
+
 /**
  * Component for validating the id of a file.
  */
 public class FileIDValidator {
-    /** The regex pattern for the file ids.*/
     protected String regex;
-    /** The system limitation for a file id (length 2-251, no control letters, and path restrictions).*/
+    /**
+     * The system limitation for a file id (length 2-251, no control letters, and path restrictions).
+     */
     private static final String SYSTEM_LIMIT = "^[^ \\./\\p{Cntrl}][^\\p{Cntrl}]{0,250}[^\\s\\p{Cntrl}]$";
 
     /**
@@ -43,17 +46,18 @@ public class FileIDValidator {
      */
     public FileIDValidator(Settings settings) {
         regex = settings.getRepositorySettings().getProtocolSettings().getAllowedFileIDPattern();
-        if(regex != null && regex.isEmpty()) {
+        if (regex != null && regex.isEmpty()) {
             regex = null;
         }
     }
 
     /**
      * Validates the given fileID. Both against the setting and against the system limit.
+     *
      * @param fileID The file id to validate.
      * @return invalid description if the id is invalid, else null.
      */
-    public ResponseInfo validateFileID(String fileID)  {
+    public ResponseInfo validateFileID(String fileID) {
         try {
             checkFileID(fileID);
             return null;
@@ -71,12 +75,12 @@ public ResponseInfo validateFileID(String fileID)  {
      */
     public void checkFileID(String fileID) {
         if (fileID != null) {
-            if(regex != null) {
-                if(!Pattern.matches(regex, fileID)) {
+            if (regex != null) {
+                if (!Pattern.matches(regex, fileID)) {
                     throw new IllegalArgumentException("The fileID '" + fileID + "' is invalid against the fileID regex '"
                             + regex + "'.");
                 }
-                if(!Pattern.matches(SYSTEM_LIMIT, fileID)) {
+                if (!Pattern.matches(SYSTEM_LIMIT, fileID)) {
                     throw new IllegalArgumentException("The fileID '" + fileID + "' is invalid against the system limit regex '"
                             + SYSTEM_LIMIT + "'.");
                 }
diff --git a/bitrepository-core/src/main/java/org/bitrepository/common/utils/FileIDsUtils.java b/bitrepository-core/src/main/java/org/bitrepository/common/utils/FileIDsUtils.java
index 117a16f4b..d52313756 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/common/utils/FileIDsUtils.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/common/utils/FileIDsUtils.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -28,12 +28,11 @@
  * Utility functions for the FileIDs object.
  */
 public class FileIDsUtils {
-    /** The constant for all file ids.*/
     private static final String ALL_FILE_IDS = "true";
-    
-    /** Private constructor to prevent instantiation.*/
-    private FileIDsUtils() {}
-    
+
+    private FileIDsUtils() {
+    }
+
     /**
      * @return The FileIDs for all file ids.
      */
@@ -42,13 +41,13 @@ public static FileIDs getAllFileIDs() {
         fileids.setAllFileIDs(ALL_FILE_IDS);
         return fileids;
     }
-    
+
     /**
      * @param fileID the file id for a specific file. Must not be null
      * @return The FileIDs object for a specific file id.
      */
     public static FileIDs getSpecificFileIDs(String fileID) {
-        ArgumentValidator.checkNotNull(fileID,"fileID");
+        ArgumentValidator.checkNotNull(fileID, "fileID");
         FileIDs fileids = new FileIDs();
         fileids.setFileID(fileID);
         return fileids;
diff --git a/bitrepository-core/src/main/java/org/bitrepository/common/utils/FileSizeUtils.java b/bitrepository-core/src/main/java/org/bitrepository/common/utils/FileSizeUtils.java
index 99c35fd73..8a3487c64 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/common/utils/FileSizeUtils.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/common/utils/FileSizeUtils.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2013 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -24,7 +24,7 @@
 import java.util.Locale;
 
 /**
- * Util class for handling formatting of datasizes. 
+ * Util class for handling formatting of data-sizes.
  */
 public class FileSizeUtils {
 
@@ -48,9 +48,9 @@ public class FileSizeUtils {
     private static final String decimalFormat = "%.2f";
 
     /*
-     * Returns the appropiate unit for a given byte size. Ie. MB or GB
-     * 
-     */	
+     * Returns the appropriate unit for a given byte size. (e.g. MB or GB)
+     *
+     */
     public static String toHumanUnit(Long size) {
         if (size == null) {
             return bytePostfix;
@@ -73,9 +73,9 @@ public static String toHumanUnit(Long size) {
     }
 
 
-    /*	 
-     *  Returns the number of bytes for a given unit (ie. MB etc)
-     */	
+    /*
+     *  Returns the number of bytes for a given unit (e.g. MB etc)
+     */
     public static long getByteSize(String unit) {
 
         if (exaPostfix.equals(unit)) {
@@ -101,9 +101,9 @@ public static long getByteSize(String unit) {
     }
 
     /*
-     * Formats bytes to standards. 
-     * Ie 1024 bytes -> 1KB 
-     */	
+     * Formats bytes to standards.
+     * E.g. 1024 bytes -> 1 KB
+     */
     public static String toHumanShort(Long size) {
         if (size == null) {
             return "0 B";
@@ -128,8 +128,9 @@ public static String toHumanShort(Long size) {
     /**
      * Formats bytes to standards
      * i.e. 2283 bytes becomes 2.23 KB
+     *
      * @param size the number of bytes, as a long
-     * @return the byte size as a human readable value
+     * @return the byte size as a human-readable value
      */
     public static String toHumanShortDecimal(Long size) {
         if (size == null) {
@@ -180,7 +181,7 @@ private static String formatShortTera(long size) {
     private static String formatShortDecimalTera(long size) {
         double TB = ((double) size / teraSize);
         return String.format(Locale.ROOT, decimalFormat, TB) + teraPostfix;
-    }	
+    }
 
     private static String formatShortGiga(long size) {
         int wholeGB = (int) (size / gigaSize);
diff --git a/bitrepository-core/src/main/java/org/bitrepository/common/utils/FileUtils.java b/bitrepository-core/src/main/java/org/bitrepository/common/utils/FileUtils.java
index 779e9a71a..b6b762d7f 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/common/utils/FileUtils.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/common/utils/FileUtils.java
@@ -1,128 +1,126 @@
 /*
  * #%L
  * bitrepository-access-client
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.common.utils;
 
+import org.bitrepository.common.ArgumentValidator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Enumeration;
+import java.util.Objects;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 import java.util.zip.ZipOutputStream;
 
-import org.bitrepository.common.ArgumentValidator;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
  * Utility class for method involving the handling of files.
  */
 public final class FileUtils {
-    /** The log.*/
     private static final Logger log = LoggerFactory.getLogger(FileUtils.class);
-    /** The maximal size of the byte array for digest.*/
     private static final int BYTE_ARRAY_SIZE = 4096;
-    
-    /**
-     * Private constructor. To prevent instantiation of this utility class.
-     */
-    private FileUtils() {}
-    
+
+    private FileUtils() {
+    }
+
     /**
-     * Function to retrieve a directory on a given path. If the directory does not already exists, then it is 
+     * Function to retrieve a directory on a given path. If the directory does not already exist, then it is
      * created.
-     * 
+     *
      * @param dirPath The path to the directory.
      * @return The directory at the end of the path.
      */
     public static File retrieveDirectory(String dirPath) {
         ArgumentValidator.checkNotNullOrEmpty(dirPath, "String dirPath");
-        
+
         // instantiate the directory
         File directory = new File(dirPath);
         instantiateAsDirectory(directory);
-        
+
         return directory;
     }
-    
+
     /**
      * Method for instantiating a subdirectory with a given name to a given directory.
-     * 
-     * @param parentDir The directory to be parent to the new directory.
-     * @param dirName The name of the directory to be instantiated.
+     *
+     * @param parentDir The directory to be the parent to the new directory.
+     * @param dirName   The name of the directory to be instantiated.
      * @return The instantiated subdirectory.
      */
     public static File retrieveSubDirectory(File parentDir, String dirName) {
         ArgumentValidator.checkNotNullOrEmpty(dirName, "String dirName");
         ArgumentValidator.checkNotNull(parentDir, "File parentDir");
-        
+
         // validate the argument
-        if(!parentDir.isDirectory()) {
+        if (!parentDir.isDirectory()) {
             throw new IllegalArgumentException("The parent directory, " + parentDir + ", is invalid");
         }
-        
+
         // instantiate the directory
         File directory = new File(parentDir, dirName);
         instantiateAsDirectory(directory);
-        
+
         return directory;
     }
-    
+
     /**
-     * Instantiates the given file as a directory. 
-     * Throws exception if invalid or it somehow cannot be instantiated.
-     * 
+     * Instantiates the given file as a directory.
+     * Throws exception if invalid, or if it somehow cannot be instantiated.
+     *
      * @param directory The file to instantiate as a directory.
      */
     private static void instantiateAsDirectory(File directory) {
-        // validate that it is not a file.
-        if(directory.isFile()) {
-            throw new IllegalArgumentException("The file directory '" + directory.getAbsolutePath() 
+        // Validate that it is not a file.
+        if (directory.isFile()) {
+            throw new IllegalArgumentException("The file directory '" + directory.getAbsolutePath()
                     + "' already exists as a file, and not as a directory, which is required.");
         }
-        
+
         // Create the directory if it does not exist, and validate that it is a directory afterwards.
-        if(!directory.exists() || !directory.isDirectory()) {
-            if(!directory.mkdirs()) {
+        if (!directory.exists() || !directory.isDirectory()) {
+            if (!directory.mkdirs()) {
                 throw new IllegalStateException("The file directory '" + directory.getAbsolutePath() + "' cannot be "
                         + "instantiated as a directory.");
             }
         }
     }
-    
+
     /**
-     * Method for recursingly removing a file or a directory (with everything within the directory).
+     * Method for recursively removing a file or a directory (with everything within the directory).
      * TODO verify, that it has successfully been removed.
+     *
      * @param f The file to remove.
      */
     public static void delete(File f) {
         ArgumentValidator.checkNotNull(f, "File f");
-        
-        if(!f.exists()) {
+
+        if (!f.exists()) {
             throw new IllegalArgumentException("The file '" + f + "' does not exist.");
         }
 
@@ -130,70 +128,74 @@ public static void delete(File f) {
     }
 
     /**
-     * Method for recursingly removing a file or a directory (with everything within the directory).
+     * Method for recursively removing a file or a directory (with everything within the directory).
+     *
      * @param dir The dir to remove.
      */
     public static void deleteDirIfExists(File dir) {
         ArgumentValidator.checkNotNull(dir, "File dir");
 
-        if(dir.isDirectory()) {
-            for(File sub : dir.listFiles()) {
+        if (dir.isDirectory()) {
+            for (File sub : Objects.requireNonNull(dir.listFiles())) {
                 delete(sub);
             }
         }
-        if(!dir.delete()) {
+        if (!dir.delete()) {
             log.warn("Could not delete '" + dir.getAbsolutePath() + "'");
         }
     }
-    
+
     /**
      * Method for deprecating a file by moving it to '*.old'. If a deprecated file already exists, then it is performed
-     * recursively, thus creating '*.old.old', '*.old.old.old*... 
+     * recursively, thus creating '*.old.old', '*.old.old.old*...
+     *
      * @param f The file to deprecate.
      */
     public static void deprecateFile(File f) {
         ArgumentValidator.checkNotNull(f, "File f");
-        
-        if(!f.exists()) {
+
+        if (!f.exists()) {
             throw new IllegalArgumentException("The file '" + f + "' does not exist.");
         }
         File deprecatedLocation = new File(f.getAbsolutePath() + ".old");
-        if(deprecatedLocation.exists()) {
+        if (deprecatedLocation.exists()) {
             deprecateFile(deprecatedLocation);
         }
-        
-        if(!f.renameTo(deprecatedLocation)) {
+
+        if (!f.renameTo(deprecatedLocation)) {
             throw new IllegalStateException("Could not deprecate the file '" + f.getAbsolutePath() + "'.");
         }
     }
-    
+
     /**
      * Method for moving a file from one position to another.
+     *
      * @param from The file to move from.
-     * @param to The file to move to.
+     * @param to   The file to move to.
      */
     public static void moveFile(File from, File to) {
         ArgumentValidator.checkNotNull(from, "File from");
         ArgumentValidator.checkNotNull(to, "File to");
-        
-        if(!from.exists()) {
+
+        if (!from.exists()) {
             throw new IllegalArgumentException("No downloaded file to archive '" + from.getName() + "'");
         }
-        if(to.exists()) {
+        if (to.exists()) {
             throw new IllegalArgumentException("The file already exists within the archive. Cannot archive again!");
         }
-        if(!to.getParentFile().exists()) {
+        if (!to.getParentFile().exists()) {
             retrieveDirectory(to.getParent());
         }
-        
-        if(!from.renameTo(to)) {
-            throw new IllegalStateException("Could not move the file '" + from.getAbsolutePath() 
+
+        if (!from.renameTo(to)) {
+            throw new IllegalStateException("Could not move the file '" + from.getAbsolutePath()
                     + "' to the location '" + to.getAbsolutePath() + "'");
         }
     }
-    
+
     /**
      * Copies a file from one place to another place.
+     *
      * @param source The source file to copy from.
      * @param target The target file to copy to.
      */
@@ -201,27 +203,27 @@ public static void copyFile(File source, File target) {
         ArgumentValidator.checkNotNull(source, "File source");
         ArgumentValidator.checkTrue(source.isFile(), "File source should exist");
         ArgumentValidator.checkNotNull(target, "File target");
-        
+
         FileInputStream is = null;
         FileOutputStream os = null;
         try {
             try {
                 is = new FileInputStream(source);
                 os = new FileOutputStream(target);
-                
+
                 byte[] bytes = new byte[BYTE_ARRAY_SIZE];
-                
+
                 int size;
-                while((size = is.read(bytes)) > 0) {
+                while ((size = is.read(bytes)) > 0) {
                     os.write(bytes, 0, size);
                 }
-                
+
                 os.flush();
             } finally {
-                if(is != null) {
+                if (is != null) {
                     is.close();
-                } 
-                if(os != null) {
+                }
+                if (os != null) {
                     os.close();
                 }
             }
@@ -230,37 +232,36 @@ public static void copyFile(File source, File target) {
                     + target + "'.", e);
         }
     }
-    
-    /** Write the contents of a stream into a file.
+
+    /**
+     * Write the contents of a stream into a file.
      *
      * @param in A stream to read from.  This stream is not closed by this
-     * method.
-     * @param f The file to write the stream contents into.
+     *           method.
+     * @param f  The file to write the stream contents into.
      * @throws IOException If any error occurs while writing the stream to a file
      */
     public static void writeStreamToFile(InputStream in, File f) throws IOException {
         ArgumentValidator.checkNotNull(f, "File f");
         ArgumentValidator.checkNotNull(in, "InputStream in");
-        
+
         byte[] buffer = new byte[BYTE_ARRAY_SIZE];
-        FileOutputStream out = new FileOutputStream(f);
-        try {
+        try (FileOutputStream out = new FileOutputStream(f)) {
             int bytesRead;
             while ((bytesRead = in.read(buffer)) > 0) {
                 out.write(buffer, 0, bytesRead);
             }
-        } finally {
-            out.close();
         }
     }
-    
-    /** Unzip a zipFile into a directory.  This will create subdirectories
+
+    /**
+     * Unzip a zipFile into a directory.  This will create subdirectories
      * as needed.
      *
      * @param zipFile The file to unzip
-     * @param toDir The directory to create the files under.  This directory
-     * will be created if necessary.  Files in it will be overwritten if the
-     * filenames match.
+     * @param toDir   The directory to create the files under.  This directory
+     *                will be created if necessary.  Files in it will be overwritten if the
+     *                filenames match.
      * @throws IOException If any error occurs while writing the stream to a file
      */
     public static void unzip(File zipFile, File toDir) throws IOException {
@@ -298,11 +299,11 @@ public static void unzip(File zipFile, File toDir) throws IOException {
             }
         }
     }
-    
-    /** 
+
+    /**
      * Zips a file.
      *
-     * @param inputFile The file to zip.
+     * @param inputFile  The file to zip.
      * @param outputFile The file where the compressed content will be placed.
      * @throws IOException If any error occurs while writing the stream to a file
      */
@@ -310,55 +311,46 @@ public static void zipFile(File inputFile, File outputFile) throws IOException {
         ArgumentValidator.checkNotNull(inputFile, "File zipFile");
         ArgumentValidator.checkNotNull(outputFile, "File toDir");
         ArgumentValidator.checkTrue(inputFile.canRead(), "can't read '" + inputFile + "'");
-        InputStream inputStream = null;
-        ZipOutputStream outStream = null;
-        
+
         byte[] buffer = new byte[BYTE_ARRAY_SIZE];
         int bytesRead;
 
-        try {
-            inputStream = new FileInputStream(inputFile);
-            outStream = new ZipOutputStream(new FileOutputStream(outputFile));
-            
+        try (InputStream inputStream = new FileInputStream(inputFile);
+             ZipOutputStream outStream = new ZipOutputStream(new FileOutputStream(outputFile))) {
+
             ZipEntry entry = new ZipEntry(inputFile.getPath());
             outStream.putNextEntry(entry);
-            
-            while((bytesRead = inputStream.read(buffer)) > 0) {
+
+            while ((bytesRead = inputStream.read(buffer)) > 0) {
                 outStream.write(buffer, 0, bytesRead);
             }
             outStream.flush();
-        } finally {
-            if (inputStream != null) {
-                inputStream.close();
-            }
-            if (outStream != null) {
-                outStream.close();
-            }
         }
     }
-    
+
     /**
      * Cleanup empty directories until it reaches the root folder.
      * It terminates when it reaches a non-empty folder, or if the current dir is the same as the root.
      * Runs recursively on the parent of the current dir.
+     *
      * @param currentDir The current directory to remove, if it is empty and not identical to the root.
-     * @param root The limit for cleaning up empty directories.
+     * @param root       The limit for cleaning up empty directories.
      */
     public static void cleanupEmptyDirectories(File currentDir, File root) {
         ArgumentValidator.checkNotNull(currentDir, "File currentDir");
         ArgumentValidator.checkNotNull(root, "File root");
-        
-        if(!currentDir.isDirectory() || currentDir.list().length > 0) {
+
+        if (!currentDir.isDirectory() || Objects.requireNonNull(currentDir.list()).length > 0) {
             return;
         }
-        if(currentDir.getAbsolutePath().equals(root.getAbsolutePath())) {
+        if (currentDir.getAbsolutePath().equals(root.getAbsolutePath())) {
             return;
         }
         boolean success = currentDir.delete();
-        if(!success) {
+        if (!success) {
             throw new IllegalStateException("Could not remove directory '" + currentDir.getAbsolutePath() + "'");
         }
-        if(currentDir.getParentFile() != null) {
+        if (currentDir.getParentFile() != null) {
             cleanupEmptyDirectories(currentDir.getParentFile(), root);
         }
     }
diff --git a/bitrepository-core/src/main/java/org/bitrepository/common/utils/ResponseInfoUtils.java b/bitrepository-core/src/main/java/org/bitrepository/common/utils/ResponseInfoUtils.java
index 52a62574d..31e969bf4 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/common/utils/ResponseInfoUtils.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/common/utils/ResponseInfoUtils.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -28,11 +28,12 @@
  * Utility class for making default responses.
  */
 public class ResponseInfoUtils {
-    /** Private constructor to prevent instantiation of this utility class.*/
-    private ResponseInfoUtils() { }
-    
+    private ResponseInfoUtils() {
+    }
+
     /**
      * The default message for identifying a contributor.
+     *
      * @return The ResponseInfo for telling that a contributor has been identified.
      */
     public static ResponseInfo getPositiveIdentification() {
@@ -40,9 +41,10 @@ public static ResponseInfo getPositiveIdentification() {
         ri.setResponseCode(ResponseCode.IDENTIFICATION_POSITIVE);
         return ri;
     }
-    
+
     /**
      * The default message for the initial progress response for a contributor.
+     *
      * @return The ResponseInfo for telling, that the operation has started.
      */
     public static ResponseInfo getInitialProgressResponse() {
diff --git a/bitrepository-core/src/main/java/org/bitrepository/common/utils/SettingsUtils.java b/bitrepository-core/src/main/java/org/bitrepository/common/utils/SettingsUtils.java
index ef5411291..5c4a55aed 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/common/utils/SettingsUtils.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/common/utils/SettingsUtils.java
@@ -5,42 +5,39 @@
  * Copyright (C) 2010 - 2013 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.common.utils;
 
+import org.bitrepository.common.settings.Settings;
+import org.bitrepository.settings.repositorysettings.Collection;
+
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import org.bitrepository.common.settings.Settings;
-import org.bitrepository.settings.repositorysettings.Collection;
-
 /**
  * Utility method for handling the settings.
  */
 public class SettingsUtils {
-    /** Default maximum pagesize / number of results used in clients. Can be overridden by configuration */
     public final static Integer DEFAULT_MAX_CLIENT_PAGE_SIZE = 10000;
-    
     private static Settings settings;
 
     /**
-     *
      * @param injectedSettings The settings to use.
      */
     public static void initialize(Settings injectedSettings) {
@@ -49,120 +46,126 @@ public static void initialize(Settings injectedSettings) {
 
     /**
      * Finds the collections, which the given pillar is part of.
+     *
      * @param pillarID The id of the pillar.
      * @return The list of collection ids, which this pillar is part of.
      */
     public static List<String> getCollectionIDsForPillar(String pillarID) {
         List<String> res = new ArrayList<>();
-        for(Collection c : settings.getRepositorySettings().getCollections().getCollection()) {
-            if(c.getPillarIDs().getPillarID().contains(pillarID)) {
+        for (Collection c : settings.getRepositorySettings().getCollections().getCollection()) {
+            if (c.getPillarIDs().getPillarID().contains(pillarID)) {
                 res.add(c.getID());
             }
         }
-        
+
         return res;
     }
-    
+
     /**
      * Finds the complete list of collections in the repository.
+     *
      * @return all collections in the repository
      */
     public static List<String> getAllCollectionsIDs() {
         List<String> res = new ArrayList<>();
-        for(Collection c : settings.getRepositorySettings().getCollections().getCollection()) {
+        for (Collection c : settings.getRepositorySettings().getCollections().getCollection()) {
             res.add(c.getID());
-        }       
+        }
         return res;
     }
-    
+
     /**
-     * Get's the name of a given collection. If no name is given in the settings, 
+     * Gets the name of a given collection. If no name is given in the settings,
      * the ID of the collection is returned
+     *
      * @param collectionID the collection id
-     * @return The name of the collection 
+     * @return The name of the collection
      */
     public static String getCollectionName(String collectionID) {
         String name = null;
-        
-        for(Collection collection : settings.getRepositorySettings().getCollections().getCollection()) {
-            if(collection.getID().equals(collectionID)) {
-                if(collection.isSetName()) {
-                    name = collection.getName();    
+
+        for (Collection collection : settings.getRepositorySettings().getCollections().getCollection()) {
+            if (collection.getID().equals(collectionID)) {
+                if (collection.isSetName()) {
+                    name = collection.getName();
                 } else {
                     name = collection.getID();
                 }
                 break;
             }
         }
-        
+
         return name;
     }
-    
+
     /**
      * Get the name of the repository
-     * @return The name of the repository 
+     *
+     * @return The name of the repository
      */
     public static String getRepositoryName() {
         return settings.getRepositorySettings().getName();
     }
-    
+
     /**
      * Retrieves all the different pillar ids defined across all collections (without duplicates).
-     * @return The list of pillar ids. 
+     *
+     * @return The list of pillar ids.
      */
     public static List<String> getAllPillarIDs() {
         List<String> res = new ArrayList<>();
-        for(Collection c : settings.getRepositorySettings().getCollections().getCollection()) {
-            for(String pillarID : c.getPillarIDs().getPillarID()) {
-                if(!res.contains(pillarID)) {
+        for (Collection c : settings.getRepositorySettings().getCollections().getCollection()) {
+            for (String pillarID : c.getPillarIDs().getPillarID()) {
+                if (!res.contains(pillarID)) {
                     res.add(pillarID);
                 }
             }
         }
         return res;
     }
-    
+
     public static List<String> getPillarIDsForCollection(String collectionID) {
         List<String> res = new ArrayList<>();
-        for(Collection c : settings.getRepositorySettings().getCollections().getCollection()) {
-            if(c.getID().equals(collectionID)) {
+        for (Collection c : settings.getRepositorySettings().getCollections().getCollection()) {
+            if (c.getID().equals(collectionID)) {
                 res.addAll(c.getPillarIDs().getPillarID());
             }
         }
         return res;
     }
-    
+
     /**
-     * Get the maximum page size for clients. 
+     * Get the maximum page size for clients.
      * If none have been set in the settings, use the default of 10000.
-     * @return {@link Integer} the maximum number of results per page. 
+     *
+     * @return {@link Integer} the maximum number of results per page.
      */
     public static Integer getMaxClientPageSize() {
         BigInteger maxClientSizeSettings = settings.getReferenceSettings().getClientSettings().getMaxPageSize();
         return maxClientSizeSettings != null ? maxClientSizeSettings.intValue() : DEFAULT_MAX_CLIENT_PAGE_SIZE;
     }
-    
+
     /**
-     * Retrieves the contributors for audittrail for a specific collection.
+     * Retrieves the contributors for audit trail for a specific collection.
+     *
      * @param collectionID The id of the collection.
-     * @return The list of ids for the contributors of audittrails for the collection
+     * @return The list of ids for the contributors of audit trails for the collection
      */
     public static Set<String> getAuditContributorsForCollection(String collectionID) {
         Set<String> contributors = new HashSet<>();
-        contributors.addAll(
-                settings.getRepositorySettings().getGetAuditTrailSettings().getNonPillarContributorIDs());
+        contributors.addAll(settings.getRepositorySettings().getGetAuditTrailSettings().getNonPillarContributorIDs());
         contributors.addAll(SettingsUtils.getPillarIDsForCollection(collectionID));
         return contributors;
     }
 
     /**
      * Retrieves the contributors for status.
+     *
      * @return The list of ids for the status contributors.
      */
     public static Set<String> getStatusContributorsForCollection() {
         Set<String> contributors = new HashSet<>();
-        contributors.addAll(
-                settings.getRepositorySettings().getGetStatusSettings().getNonPillarContributorIDs());
+        contributors.addAll(settings.getRepositorySettings().getGetStatusSettings().getNonPillarContributorIDs());
         contributors.addAll(SettingsUtils.getAllPillarIDs());
         return contributors;
     }
diff --git a/bitrepository-core/src/main/java/org/bitrepository/common/utils/StreamUtils.java b/bitrepository-core/src/main/java/org/bitrepository/common/utils/StreamUtils.java
index b8ca8a019..96b1a761c 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/common/utils/StreamUtils.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/common/utils/StreamUtils.java
@@ -1,23 +1,23 @@
 /*
  * #%L
  * Bitmagasin Protocol
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -32,38 +32,35 @@
  * Utility class for handling standard stream issues.
  */
 public final class StreamUtils {
-    /** Private constructor to prevent instantiation of this utility class.*/
-    private StreamUtils() {}
-    
-    /** The default buffer size. 32 kb. */
-    private static final int IO_BUFFER_SIZE = 32*1024;
-    
+    private StreamUtils() {
+    }
+
+    private static final int IO_BUFFER_SIZE = 32 * 1024;
+
     /**
-     * Utility function for moving data from an inputstream to an outputstream.
+     * Utility function for moving data from an input-stream to an output-stream.
      * TODO move to a utility class.
-     * 
-     * @param in The input stream to copy to the output stream.
+     *
+     * @param in  The input stream to copy to the output stream.
      * @param out The output stream where the input stream should be copied.
-     * @throws IOException If anything problems occur with transferring the 
-     * data between the streams.
+     * @throws IOException If anything problems occur with transferring the
+     *                     data between the streams.
      */
     public static void copyInputStreamToOutputStream(InputStream in,
-            OutputStream out) throws IOException {
-        if(in == null || out == null) {
-            throw new IllegalArgumentException("InputStream: " + in 
+                                                     OutputStream out) throws IOException {
+        if (in == null || out == null) {
+            throw new IllegalArgumentException("InputStream: " + in
                     + ", OutputStream: " + out);
         }
-        
-        try {
+
+        try (in) {
             byte[] buf = new byte[IO_BUFFER_SIZE];
             int bytesRead;
             while ((bytesRead = in.read(buf)) != -1) {
                 out.write(buf, 0, bytesRead);
             }
             out.flush();
-        } finally {
-            in.close();
         }
     }
-    
+
 }
diff --git a/bitrepository-core/src/main/java/org/bitrepository/common/utils/TimeMeasurementUtils.java b/bitrepository-core/src/main/java/org/bitrepository/common/utils/TimeMeasurementUtils.java
index 4b650de02..f03cfc2c4 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/common/utils/TimeMeasurementUtils.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/common/utils/TimeMeasurementUtils.java
@@ -1,37 +1,37 @@
 /*
  * #%L
  * Bitrepository Protocol
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.common.utils;
 
-import java.math.BigInteger;
-import java.util.Comparator;
-import java.util.UnknownFormatConversionException;
-
 import org.bitrepository.bitrepositoryelements.TimeMeasureTYPE;
 import org.bitrepository.bitrepositoryelements.TimeMeasureUnit;
 import org.bitrepository.common.ArgumentValidator;
 
+import java.math.BigInteger;
+import java.util.Comparator;
+import java.util.UnknownFormatConversionException;
+
 /**
  * Provides helper method for accessing {@link TimeMeasureTYPE} objects.
  */
@@ -40,37 +40,41 @@ public class TimeMeasurementUtils {
     /**
      * Private constructor. To prevent instantiation of this utility class.
      */
-    private TimeMeasurementUtils() { }
-    
+    private TimeMeasurementUtils() {
+    }
+
     /**
      * Generates a TimeMeasureTYPE object based on a milliseconds value.
+     *
      * @param milliseconds The time measure in milliseconds.
      * @return A corresponding <code>TimeMeasureTYPE</code> object.
      */
-    public static TimeMeasureTYPE getTimeMeasurementFromMiliseconds(BigInteger milliseconds) {
+    public static TimeMeasureTYPE getTimeMeasurementFromMilliseconds(BigInteger milliseconds) {
         TimeMeasureTYPE timeMeasure = new TimeMeasureTYPE();
         timeMeasure.setTimeMeasureValue(milliseconds);
         timeMeasure.setTimeMeasureUnit(TimeMeasureUnit.MILLISECONDS);
-        return timeMeasure; 
+        return timeMeasure;
     }
-    
+
     /**
-     * Method for getting the maximum time. Uses the maximum value of Long and puts it in HOURS.
+     * Method for getting the maximum time. Uses the maximum value of Long and puts it in {@link TimeMeasureUnit#HOURS)}.
+     *
      * @return The TimeMeasure for the maximum time.
      */
     public static TimeMeasureTYPE getMaximumTime() {
         TimeMeasureTYPE timeMeasure = new TimeMeasureTYPE();
         timeMeasure.setTimeMeasureValue(BigInteger.valueOf(Long.MAX_VALUE));
         timeMeasure.setTimeMeasureUnit(TimeMeasureUnit.HOURS);
-        return timeMeasure; 
+        return timeMeasure;
     }
-    
+
     /**
-     * Compares its two arguments for order. Returns a negative integer, zero, or a positive integer as the first 
+     * Compares its two arguments for order. Returns a negative integer, zero, or a positive integer as the first
      * argument is less than, equal to, or greater than the second.
+     *
      * @param time1 time1
      * @param time2 time2
-     * @return a negative integer, zero, or a positive integer as the first argument is less than, equal to, or 
+     * @return a negative integer, zero, or a positive integer as the first argument is less than, equal to, or
      * greater than the second.
      * @see Comparator
      */
@@ -79,26 +83,27 @@ public static int compare(TimeMeasureTYPE time1, TimeMeasureTYPE time2) {
         ArgumentValidator.checkNotNull(time2, "time2");
         return convertToMilliSeconds(time1).compareTo(convertToMilliSeconds(time2));
     }
-    
-    /** Normalizes <code>TimeMeasureTYPE</code> into milliseconds.
-     * 
+
+    /**
+     * Normalizes {@link TimeMeasureTYPE} into milliseconds.
+     *
      * @param timeMeasure The time measure to convert
      * @return The time measure in milliseconds
      * @throws UnknownFormatConversionException Unable to interpret the supplied timeMeasure.
      */
     private static BigInteger convertToMilliSeconds(TimeMeasureTYPE timeMeasure) throws UnknownFormatConversionException {
-        if(TimeMeasureUnit.MILLISECONDS.equals(timeMeasure.getTimeMeasureUnit())) {
+        if (TimeMeasureUnit.MILLISECONDS.equals(timeMeasure.getTimeMeasureUnit())) {
             return timeMeasure.getTimeMeasureValue();
         } else if ((TimeMeasureUnit.HOURS.equals(timeMeasure.getTimeMeasureUnit()))) {
-            return timeMeasure.getTimeMeasureValue().multiply(new BigInteger("3600000"));     
+            return timeMeasure.getTimeMeasureValue().multiply(new BigInteger("3600000"));
         } else {
-            throw new UnknownFormatConversionException ("Unable to compare times, unknown unit " + 
-                    timeMeasure.getTimeMeasureUnit());
+            throw new UnknownFormatConversionException("Unable to compare times, unknown unit " + timeMeasure.getTimeMeasureUnit());
         }
     }
-    
+
     /**
-     * Compares a TimeMeasure to a long representation in milliseconds.
+     * Compares a {@link TimeMeasureTYPE} to a long representation in milliseconds.
+     *
      * @param time1 The TimeMeasure to compare.
      * @param time2 The time in milliseconds to compare.
      * @return -1 if time2 is larger, 0 if they are equals, or 1 if time1 is larger.
@@ -106,10 +111,11 @@ private static BigInteger convertToMilliSeconds(TimeMeasureTYPE timeMeasure) thr
     public static int compare(TimeMeasureTYPE time1, long time2) {
         return convertToMilliSeconds(time1).compareTo(BigInteger.valueOf(time2));
     }
-    
+
     /**
-     * Method for converting a TimeMeasure into a long.
-     * @param time1 The TimeMeasure to convert.
+     * Method for converting a {@link TimeMeasureTYPE} into a long.
+     *
+     * @param time1 The TimeMeasureTYPE to convert.
      * @return The value of the TimeMeasure as a long.
      */
     public static long getTimeMeasureInLong(TimeMeasureTYPE time1) {
diff --git a/bitrepository-core/src/main/java/org/bitrepository/common/utils/TimeUtils.java b/bitrepository-core/src/main/java/org/bitrepository/common/utils/TimeUtils.java
index b87f50f5c..feccec24f 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/common/utils/TimeUtils.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/common/utils/TimeUtils.java
@@ -5,60 +5,49 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.common.utils;
 
+import javax.xml.datatype.XMLGregorianCalendar;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
 
-import javax.xml.datatype.XMLGregorianCalendar;
-
 /**
- * Util class to handle the presentation of time in a human readable form 
+ * Util class to handle the presentation of time in a human-readable form
  */
 public final class TimeUtils {
-    /** Milliseconds per second.*/
     public static final int MS_PER_S = 1000;
-    /** Seconds per minute.*/
     public static final int S_PER_M = 60;
-    /** Minutes per hour.*/
     public static final int M_PER_H = 60;
-    /** Hours per day.*/
     public static final int H_PER_D = 24;
-    /** Days per year in a 'normal' 365 day year. */
     public static final int DAYS_PER_YEAR = 365;
-    /** Milliseconds per minute.*/
     public static final int MS_PER_MINUTE = MS_PER_S * S_PER_M;
-    /** Milliseconds per hour.*/
     public static final int MS_PER_HOUR = MS_PER_MINUTE * M_PER_H;
-    /** Milliseconds per day.*/
     public static final long MS_PER_DAY = MS_PER_HOUR * H_PER_D;
-    /** Milliseconds per normal year.*/
     public static final long MS_PER_YEAR = DAYS_PER_YEAR * MS_PER_DAY;
-
-    /** DateFormat used for outputting data strings */
     public final static DateFormat formatter = new SimpleDateFormat("yyyy/MM/dd HH:mm", Locale.ROOT);
-    
-    /** Private constructor, util class.*/
-    private TimeUtils() {}
-    
+
+    private TimeUtils() {
+    }
+
     /**
      * Convert from milliseconds to seconds.
+     *
      * @param ms The milliseconds to convert
      * @return The milliseconds converted into seconds.
      */
@@ -66,19 +55,21 @@ public static String millisecondsToSeconds(long ms) {
         int seconds = (int) (ms / MS_PER_S);
         return seconds + "s";
     }
-    
+
     /**
      * Convert from milliseconds to minutes.
+     *
      * @param ms The milliseconds to convert
      * @return The milliseconds converted into minutes.
      */
     public static String millisecondsToMinutes(long ms) {
-        int minutes = (int) (ms / MS_PER_MINUTE );
+        int minutes = (int) (ms / MS_PER_MINUTE);
         return minutes + "m";
     }
-    
+
     /**
      * Convert from milliseconds to hours.
+     *
      * @param ms The milliseconds to convert
      * @return The milliseconds converted into hours.
      */
@@ -86,9 +77,10 @@ public static String millisecondsToHours(long ms) {
         int hours = (int) (ms / MS_PER_HOUR);
         return hours + "h";
     }
-    
+
     /**
      * Convert from milliseconds to days.
+     *
      * @param ms The milliseconds to convert
      * @return The milliseconds converted into days.
      */
@@ -96,44 +88,36 @@ public static String millisecondsToDays(long ms) {
         int days = (int) (ms / MS_PER_DAY);
         return days + "d";
     }
-    
+
     /**
-     * Convert from milliseconds to a human readable format with days, hours, minutes, seconds and 
+     * Convert from milliseconds to a human-readable format with days, hours, minutes, seconds and
      * the remaining milliseconds.
+     *
      * @param ms The milliseconds to convert
-     * @return The milliseconds converted a human readable format..
+     * @return The milliseconds converted a human-readable format.
      */
     public static String millisecondsToHuman(long ms) {
         StringBuilder sb = new StringBuilder();
-        boolean includeRemainingMs = true;
-        if(ms >= MS_PER_MINUTE) {
-            includeRemainingMs = false;
-        }
-        if(ms >= 0) {
-            if(ms >= MS_PER_DAY) {
+        boolean includeRemainingMs = ms < MS_PER_MINUTE;
+        if (ms >= 0) {
+            if (ms >= MS_PER_DAY) {
                 sb.append(millisecondsToDays(ms));
             }
             ms = (ms % MS_PER_DAY);
-            if(ms >= 0) {
-                if(ms >= MS_PER_HOUR) {
-                    sb.append(" " + millisecondsToHours(ms));
-                }
-                ms = (ms % MS_PER_HOUR);
-                if(ms >= 0) {
-                    if(ms >= MS_PER_MINUTE) {
-                        sb.append(" " + millisecondsToMinutes(ms));
-                    }
-                    ms = (ms % MS_PER_MINUTE);
-                    if(ms >= 0) {
-                        if(ms >= MS_PER_S) {
-                            sb.append(" " + millisecondsToSeconds(ms));
-                        }
-                        ms = (ms % MS_PER_S);
-                        if(ms >= 0 && includeRemainingMs) {
-                            sb.append(" " + ms + " ms");
-                        }
-                    }
-                }
+            if (ms >= MS_PER_HOUR) {
+                sb.append(" ").append(millisecondsToHours(ms));
+            }
+            ms = (ms % MS_PER_HOUR);
+            if (ms >= MS_PER_MINUTE) {
+                sb.append(" ").append(millisecondsToMinutes(ms));
+            }
+            ms = (ms % MS_PER_MINUTE);
+            if (ms >= MS_PER_S) {
+                sb.append(" ").append(millisecondsToSeconds(ms));
+            }
+            ms = (ms % MS_PER_S);
+            if (includeRemainingMs) {
+                sb.append(" ").append(ms).append(" ms");
             }
         }
         return sb.toString();
@@ -142,19 +126,20 @@ public static String millisecondsToHuman(long ms) {
     public static String shortDate(Date date) {
         return formatter.format(date);
     }
-    
+
     public static String shortDate(XMLGregorianCalendar cal) {
         return formatter.format(cal.toGregorianCalendar().getTime());
     }
-    
+
     /**
      * Get the latest date of the two inputs
-     * @param currentMax The current latest date 
-     * @param itemDate The new candidate latest
-     * @return The date object that was the latest of the two inputs. 
+     *
+     * @param currentMax The current latest date
+     * @param itemDate   The new candidate latest
+     * @return The date object that was the latest of the two inputs.
      */
     public static Date getMaxDate(Date currentMax, Date itemDate) {
-        if(itemDate.after(currentMax)) {
+        if (itemDate.after(currentMax)) {
             return itemDate;
         } else {
             return currentMax;
diff --git a/bitrepository-core/src/main/java/org/bitrepository/common/utils/package-info.java b/bitrepository-core/src/main/java/org/bitrepository/common/utils/package-info.java
index bd70326de..7e8f8fada 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/common/utils/package-info.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/common/utils/package-info.java
@@ -1,23 +1,23 @@
 /*
  * #%L
- * bitrepository-common
- * 
+ * BitRepository-common
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
diff --git a/bitrepository-core/src/main/java/org/bitrepository/common/webobjects/StatisticsCollectionSize.java b/bitrepository-core/src/main/java/org/bitrepository/common/webobjects/StatisticsCollectionSize.java
index 83ce2226f..37421e8a9 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/common/webobjects/StatisticsCollectionSize.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/common/webobjects/StatisticsCollectionSize.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2013 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -25,13 +25,13 @@
 
 @XmlRootElement
 public class StatisticsCollectionSize {
-
     private String collectionID;
     private String collectionName;
     private Long dataSize;
     private String humanSize;
-    
-    public StatisticsCollectionSize() {}
+
+    public StatisticsCollectionSize() {
+    }
 
     public String getCollectionID() {
         return collectionID;
@@ -64,5 +64,5 @@ public String getHumanSize() {
     public void setHumanSize(String humanSize) {
         this.humanSize = humanSize;
     }
-    
+
 }
diff --git a/bitrepository-core/src/main/java/org/bitrepository/common/webobjects/StatisticsDataSize.java b/bitrepository-core/src/main/java/org/bitrepository/common/webobjects/StatisticsDataSize.java
index 0a6841530..1eb204528 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/common/webobjects/StatisticsDataSize.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/common/webobjects/StatisticsDataSize.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2013 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -25,13 +25,13 @@
 
 @XmlRootElement
 public class StatisticsDataSize {
-
-    private Long dateMillis; 
+    private Long dateMillis;
     private String dateString;
     private Long dataSize;
     private Long fileCount;
-    
-    public StatisticsDataSize() { }
+
+    public StatisticsDataSize() {
+    }
 
     public Long getDateMillis() {
         return dateMillis;
@@ -64,6 +64,6 @@ public Long getFileCount() {
     public void setFileCount(Long fileCount) {
         this.fileCount = fileCount;
     }
-    
-    
+
+
 }
diff --git a/bitrepository-core/src/main/java/org/bitrepository/common/webobjects/StatisticsPillarSize.java b/bitrepository-core/src/main/java/org/bitrepository/common/webobjects/StatisticsPillarSize.java
index 01cc54681..8f283eb43 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/common/webobjects/StatisticsPillarSize.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/common/webobjects/StatisticsPillarSize.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2013 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -25,12 +25,12 @@
 
 @XmlRootElement
 public class StatisticsPillarSize {
-
     private String pillarID;
     private Long dataSize;
     private String humanSize;
-    
-    public StatisticsPillarSize() {}
+
+    public StatisticsPillarSize() {
+    }
 
     public String getPillarID() {
         return pillarID;
@@ -55,5 +55,5 @@ public String getHumanSize() {
     public void setHumanSize(String humanSize) {
         this.humanSize = humanSize;
     }
-    
+
 }
diff --git a/bitrepository-core/src/main/java/org/bitrepository/protocol/CoordinationLayerException.java b/bitrepository-core/src/main/java/org/bitrepository/protocol/CoordinationLayerException.java
index cd0a5a99a..ef849ce41 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/protocol/CoordinationLayerException.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/protocol/CoordinationLayerException.java
@@ -1,23 +1,23 @@
 /*
  * #%L
  * Bitrepository Protocol
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -32,8 +32,9 @@ public class CoordinationLayerException extends RuntimeException {
 
     /**
      * Constructor for this exception based on a causing exception and described by a message.
+     *
      * @param message The message for the exception.
-     * @param t The throwable that caused the exception
+     * @param t       The throwable that caused the exception
      */
     public CoordinationLayerException(String message, Throwable t) {
         super(message, t);
@@ -41,6 +42,7 @@ public CoordinationLayerException(String message, Throwable t) {
 
     /**
      * Constructor for this exception based on a text message.
+     *
      * @param message The message for the exception.
      */
     public CoordinationLayerException(String message) {
diff --git a/bitrepository-core/src/main/java/org/bitrepository/protocol/CorrelationIDGenerator.java b/bitrepository-core/src/main/java/org/bitrepository/protocol/CorrelationIDGenerator.java
index 440d749f7..a1823fdc1 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/protocol/CorrelationIDGenerator.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/protocol/CorrelationIDGenerator.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
diff --git a/bitrepository-core/src/main/java/org/bitrepository/protocol/FileExchange.java b/bitrepository-core/src/main/java/org/bitrepository/protocol/FileExchange.java
index a3934cb0b..fa0177f31 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/protocol/FileExchange.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/protocol/FileExchange.java
@@ -1,23 +1,23 @@
 /*
  * #%L
  * Bitrepository Protocol
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -37,13 +37,14 @@
  * through a common url.
  */
 public interface FileExchange {
-    
+
     /**
      * Method for uploading to a specific URL.
-     * @param in The stream from the file to upload.
+     *
+     * @param in  The stream from the file to upload.
      * @param url The URL where the stream is to be put.
      * @throws IOException If any problems occurs during the transportation of
-     * the data.
+     *                     the data.
      */
     void putFile(InputStream in, URL url) throws IOException;
 
@@ -58,28 +59,30 @@ public interface FileExchange {
 
     /**
      * Retrieves the data from a given url and puts it onto a given
-     * outputstream. 
+     * output-stream.
      *
      * @param out The output stream to put the data.
      * @param url The url for where the data should be retrieved.
      * @throws IOException If any problems occurs during the retrieval of the
-     * data.
+     *                     data.
      */
     void getFile(OutputStream out, URL url) throws IOException;
+
     /**
      * Method for retrieving a specific URL as a stream.
+     *
      * @param url The URL to retrieve.
      * @return The InputStream for the data at the given URL.
      * @throws IOException If any problems occurs during the transportation of
-     * the data.
+     *                     the data.
      */
     InputStream getFile(URL url) throws IOException;
 
     /**
      * Method for downloading a file at a given address.
      *
-     * @param outputFile The file where the data at the address should be
-     * placed.
+     * @param outputFile  The file where the data at the address should be
+     *                    placed.
      * @param fileAddress The address where the data should be downloaded from.
      */
     void getFile(File outputFile, String fileAddress);
@@ -88,18 +91,18 @@ public interface FileExchange {
      * Creates the URL based on a filename.
      *
      * @param filename The name of the piece of data to transfer (in the form
-     * of a file).
+     *                 of a file).
      * @return The URL containing the filename.
      * @throws MalformedURLException If the filename prevents the creation of
-     * a valid URL.
+     *                               a valid URL.
      */
     URL getURL(String filename) throws MalformedURLException;
-    
+
     /**
      * Removes a file from the given URL.
-     * 
+     *
      * @param url The URL where the file should be removed from.
-     * @throws IOException If issues occurs while removing the file.
+     * @throws IOException        If issues occurs while removing the file.
      * @throws URISyntaxException If the URL is not valid.
      */
     void deleteFile(URL url) throws IOException, URISyntaxException;
diff --git a/bitrepository-core/src/main/java/org/bitrepository/protocol/InvalidMessageVersionException.java b/bitrepository-core/src/main/java/org/bitrepository/protocol/InvalidMessageVersionException.java
index 21f8e9c05..ca31540fb 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/protocol/InvalidMessageVersionException.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/protocol/InvalidMessageVersionException.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -26,18 +26,17 @@
 
 @SuppressWarnings("serial")
 public class InvalidMessageVersionException extends RuntimeException {
+    private final ResponseInfo response;
 
-    private ResponseInfo response;
-    
     public InvalidMessageVersionException(ResponseCode responseCode, String responseText) {
-    	super(responseText);
+        super(responseText);
         response = new ResponseInfo();
         response.setResponseCode(responseCode);
         response.setResponseText(responseText);
     }
-    
+
     public ResponseInfo getResponseInfo() {
         return response;
     }
-    
+
 }
diff --git a/bitrepository-core/src/main/java/org/bitrepository/protocol/LocalFileExchange.java b/bitrepository-core/src/main/java/org/bitrepository/protocol/LocalFileExchange.java
index 73ff52c37..f873b88f6 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/protocol/LocalFileExchange.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/protocol/LocalFileExchange.java
@@ -8,12 +8,12 @@
  * it under the terms of the GNU Lesser General Public License as
  * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
@@ -21,6 +21,9 @@
  */
 package org.bitrepository.protocol;
 
+import org.bitrepository.common.utils.FileUtils;
+import org.bitrepository.common.utils.StreamUtils;
+
 import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -31,11 +34,8 @@
 import java.net.URISyntaxException;
 import java.net.URL;
 
-import org.bitrepository.common.utils.FileUtils;
-import org.bitrepository.common.utils.StreamUtils;
-
 /**
- * File exchange used for exchanging files on a local filesystem 
+ * File exchange used for exchanging files on a local filesystem
  */
 public class LocalFileExchange implements FileExchange {
     private final File storageDir;
@@ -51,6 +51,7 @@ public void putFile(InputStream in, URL url) throws IOException {
 
     /**
      * Put the file into bitrepository and return the url of the ingested file
+     *
      * @param dataFile File to get ingested
      * @return URL encoded url test#file is returned as test%23file
      */
@@ -69,28 +70,28 @@ public URL putFile(File dataFile) {
     public InputStream getFile(URL url) throws IOException {
         return url.openStream();
     }
-    
+
     @Override
     public void getFile(OutputStream out, URL url) throws IOException {
-        try(InputStream fis = url.openStream()) {
-            StreamUtils.copyInputStreamToOutputStream(fis, out);    
+        try (InputStream fis = url.openStream()) {
+            StreamUtils.copyInputStreamToOutputStream(fis, out);
         }
     }
 
     @Override
     public void getFile(File outputFile, String fileAddress) {
-        URL url; 
+        URL url;
         try {
             url = new URL(fileAddress);
         } catch (MalformedURLException e) {
             throw new IllegalStateException("Cannot create the URL.", e);
         }
-        
-        try(OutputStream out = new BufferedOutputStream(new FileOutputStream(outputFile))) {
+
+        try (OutputStream out = new BufferedOutputStream(new FileOutputStream(outputFile))) {
             getFile(out, url);
         } catch (IOException e) {
             throw new CoordinationLayerException("Could not download data "
-                    + "from '" + fileAddress + "' (url: '" + url + "') to the file '" 
+                    + "from '" + fileAddress + "' (url: '" + url + "') to the file '"
                     + outputFile.getAbsolutePath() + "'.", e);
         }
     }
@@ -103,7 +104,7 @@ public URL getURL(String filename) throws MalformedURLException {
             url = dest.toURI().toURL();
         } catch (MalformedURLException e) {
             throw new IllegalStateException("Cannot create the URL.", e);
-        } 
+        }
         return url;
     }
 
diff --git a/bitrepository-core/src/main/java/org/bitrepository/protocol/MessageContext.java b/bitrepository-core/src/main/java/org/bitrepository/protocol/MessageContext.java
index 69792e471..a556a456e 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/protocol/MessageContext.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/protocol/MessageContext.java
@@ -8,12 +8,12 @@
  * it under the terms of the GNU Lesser General Public License as
  * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
diff --git a/bitrepository-core/src/main/java/org/bitrepository/protocol/MessageVersionValidator.java b/bitrepository-core/src/main/java/org/bitrepository/protocol/MessageVersionValidator.java
index 074a4592a..b25499cbe 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/protocol/MessageVersionValidator.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/protocol/MessageVersionValidator.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -28,36 +28,38 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * Class to handle message version validation for implementation of versioning support.  
+ * Class to handle message version validation for implementation of versioning support.
  */
 public class MessageVersionValidator {
 
     private static final Logger log = LoggerFactory.getLogger(MessageVersionValidator.class);
     private static ProtocolVersionDefinition protocolVersion = new ProtocolVersionDefinition();
+
     static {
         protocolVersion = ProtocolVersionLoader.loadProtocolVersion();
     }
-    
+
     /**
-     * Private constructor 
+     * Private constructor
      */
-    private MessageVersionValidator() {}
-    
+    private MessageVersionValidator() {
+    }
+
     public static void validateMessageVersion(Message message) throws InvalidMessageVersionException {
-        if(message.getMinVersion().compareTo(protocolVersion.getVersion()) > 0) {
+        if (message.getMinVersion().compareTo(protocolVersion.getVersion()) > 0) {
             log.info("The Request minimum version is LARGER than this components version = " + protocolVersion.getVersion());
-            throw new InvalidMessageVersionException(ResponseCode.REQUEST_NOT_UNDERSTOOD_FAILURE, 
+            throw new InvalidMessageVersionException(ResponseCode.REQUEST_NOT_UNDERSTOOD_FAILURE,
                     "The requested minimum version is too large, components version: " + protocolVersion.getVersion());
         }
-        if(message.getVersion() != null && message.getVersion().compareTo(protocolVersion.getMinVersion()) < 0) {
+        if (message.getVersion() != null && message.getVersion().compareTo(protocolVersion.getMinVersion()) < 0) {
             log.info("The Request version is SMALLER than this components minimum version = " +
                     protocolVersion.getMinVersion());
             throw new InvalidMessageVersionException(ResponseCode.REQUEST_NOT_UNDERSTOOD_FAILURE,
                     "The requested version is smaller than the components minimum version, pillar minVersion: " +
-                    protocolVersion.getMinVersion());
+                            protocolVersion.getMinVersion());
         }
     }
-    
+
     public static String getProtocolVersion() {
         return protocolVersion.getVersion().toString();
     }
diff --git a/bitrepository-core/src/main/java/org/bitrepository/protocol/OperationType.java b/bitrepository-core/src/main/java/org/bitrepository/protocol/OperationType.java
index fc113fa4d..eefc5e3d2 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/protocol/OperationType.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/protocol/OperationType.java
@@ -10,21 +10,21 @@
 
 /*
  * #%L
- * Bitrepository Core
+ * BitRepository Core
  * %%
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -54,7 +54,7 @@ public String value() {
     }
 
     public static OperationType fromValue(String v) {
-        for (OperationType c: OperationType.values()) {
+        for (OperationType c : OperationType.values()) {
             if (c.value.equals(v)) {
                 return c;
             }
diff --git a/bitrepository-core/src/main/java/org/bitrepository/protocol/ProtocolComponentFactory.java b/bitrepository-core/src/main/java/org/bitrepository/protocol/ProtocolComponentFactory.java
index 012cd1cdd..ddfba3534 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/protocol/ProtocolComponentFactory.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/protocol/ProtocolComponentFactory.java
@@ -1,23 +1,23 @@
 /*
  * #%L
  * Bitrepository Protocol
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -36,14 +36,8 @@
  * Provides access to the different component in the org.bitrepository.org.bitrepository.protocol module (Spring/IOC wannabe)
  */
 public final class ProtocolComponentFactory {
-
-    /** The singleton instance */
     private static ProtocolComponentFactory instance;
 
-    /**
-     * The singletonic access to the instance of this class
-     * @return The one and only instance
-     */
     public static synchronized ProtocolComponentFactory getInstance() {
         if (instance == null) {
             instance = new ProtocolComponentFactory();
@@ -54,39 +48,43 @@ public static synchronized ProtocolComponentFactory getInstance() {
     /**
      * The singleton constructor.
      */
-    protected ProtocolComponentFactory() { }
+    private ProtocolComponentFactory() {
+    }
 
-    /** @see #getFileExchange(Settings) */
-    protected FileExchange fileExchange;
+    /**
+     * @see #getFileExchange(Settings)
+     */
+    private FileExchange fileExchange;
 
     /**
-     * Gets you an <code>MessageBus</code> instance for accessing the Bitrepositorys message bus. If a messagebus 
+     * Gets you an <code>MessageBus</code> instance for accessing the BitRepository's message bus. If a message bus
      * already exists for the collection ID defined in the settings, the existing instance is returned.
-     * @param settings The settings to get the MessageBus 
-     * @param securityManager The SecurityManager for the messagebus
-     * @return The messagebus for this collection.
+     *
+     * @param settings        The settings to get the MessageBus
+     * @param securityManager The SecurityManager for the message bus
+     * @return The message bus for this collection.
      */
     public MessageBus getMessageBus(Settings settings, SecurityManager securityManager) {
         return MessageBusManager.getMessageBus(settings, securityManager);
     }
 
     /**
-     * Gets you an <code>FileExchange</code> instance for data communication. Is instantiated based on the 
+     * Gets you an <code>FileExchange</code> instance for data communication. Is instantiated based on the
      * configurations.
+     *
      * @param settings The settings for the file exchange.
      * @return The FileExchange according to the configuration.
      */
     public FileExchange getFileExchange(Settings settings) {
         if (fileExchange == null) {
-            if((settings.getReferenceSettings().getFileExchangeSettings() != null )) {
+            if ((settings.getReferenceSettings().getFileExchangeSettings() != null)) {
                 ProtocolType protocolType = settings.getReferenceSettings().getFileExchangeSettings().getProtocolType();
-                if(protocolType == ProtocolType.HTTP) {
+                if (protocolType == ProtocolType.HTTP) {
                     fileExchange = new HttpFileExchange(settings);
                 } else if (protocolType == ProtocolType.HTTPS) {
                     fileExchange = new HttpsFileExchange(settings);
                 } else if (protocolType == ProtocolType.FILE) {
-                    fileExchange = new LocalFileExchange(
-                            settings.getReferenceSettings().getFileExchangeSettings().getPath());
+                    fileExchange = new LocalFileExchange(settings.getReferenceSettings().getFileExchangeSettings().getPath());
                 }
             } else {
                 fileExchange = new HttpFileExchange(settings);
diff --git a/bitrepository-core/src/main/java/org/bitrepository/protocol/ProtocolVersionLoader.java b/bitrepository-core/src/main/java/org/bitrepository/protocol/ProtocolVersionLoader.java
index 675be5e3e..2259bfaf8 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/protocol/ProtocolVersionLoader.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/protocol/ProtocolVersionLoader.java
@@ -5,45 +5,47 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.protocol;
 
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.InputStream;
-
 import org.bitrepository.common.JaxbHelper;
 import org.bitrepository.protocolversiondefinition.ProtocolVersionDefinition;
 import org.xml.sax.SAXException;
 
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+
 public class ProtocolVersionLoader {
 
     private static ProtocolVersionDefinition protocolVersionDefinition;
-    
+
     /**
-     * Private constructor 
+     * Private constructor
      */
-    private ProtocolVersionLoader() {}
-    
+    private ProtocolVersionLoader() {
+    }
+
     /**
      * Load protocol version definition
+     *
      * @return ProtocolVersionDefinition for the protocol version the project has been build against
      */
     public static ProtocolVersionDefinition loadProtocolVersion() {
-        if(protocolVersionDefinition == null) {
+        if (protocolVersionDefinition == null) {
             String fileLocation = "versioning/ProtocolVersionDefinition.xml";
             String schemaLocation = "versioning/ProtocolVersionDefinition.xsd";
             JaxbHelper jaxbHelper = new JaxbHelper(null, schemaLocation);
@@ -63,13 +65,13 @@ public static ProtocolVersionDefinition loadProtocolVersion() {
                 jaxbHelper.validate(configStreamValidate);
                 protocolVersionDefinition = jaxbHelper.loadXml(ProtocolVersionDefinition.class, configStreamLoad);
             } catch (SAXException e) {
-                throw new RuntimeException("Unable to validate settings from " + 
+                throw new RuntimeException("Unable to validate settings from " +
                         Thread.currentThread().getContextClassLoader().getResource(fileLocation), e);
             } catch (Exception e) {
                 throw new RuntimeException("Unable to load settings from " + fileLocation, e);
-            }  
+            }
         }
         return protocolVersionDefinition;
-                
+
     }
 }
diff --git a/bitrepository-core/src/main/java/org/bitrepository/protocol/ResponsePopulator.java b/bitrepository-core/src/main/java/org/bitrepository/protocol/ResponsePopulator.java
index ac08f526d..28852260b 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/protocol/ResponsePopulator.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/protocol/ResponsePopulator.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -58,7 +58,7 @@ protected void initialiseResponseDetails(
     public void initialisePositiveIdentifyResponse(
             MessageResponse response,
             String correlationID, String to) {
-        initialiseResponseDetails(response,correlationID, to);
+        initialiseResponseDetails(response, correlationID, to);
         ResponseInfo info = new ResponseInfo();
         info.setResponseCode(ResponseCode.IDENTIFICATION_POSITIVE);
         info.setResponseText("Ready to service ");
diff --git a/bitrepository-core/src/main/java/org/bitrepository/protocol/activemq/ActiveMQMessageBus.java b/bitrepository-core/src/main/java/org/bitrepository/protocol/activemq/ActiveMQMessageBus.java
index fc0cc17a5..12b543e06 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/protocol/activemq/ActiveMQMessageBus.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/protocol/activemq/ActiveMQMessageBus.java
@@ -1,49 +1,29 @@
 /*
  * #%L
  * Bitmagasin integrationstest
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.protocol.activemq;
 
-import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ThreadFactory;
-import javax.jms.Connection;
-import javax.jms.DeliveryMode;
-import javax.jms.Destination;
-import javax.jms.ExceptionListener;
-import javax.jms.JMSException;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-import javax.jms.Topic;
-
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.util.ByteArrayInputStream;
 import org.bitrepository.bitrepositorymessages.Message;
@@ -76,6 +56,25 @@
 import org.slf4j.LoggerFactory;
 import org.xml.sax.SAXException;
 
+import javax.jms.Connection;
+import javax.jms.DeliveryMode;
+import javax.jms.Destination;
+import javax.jms.ExceptionListener;
+import javax.jms.JMSException;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+import javax.jms.Topic;
+import java.nio.charset.StandardCharsets;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ThreadFactory;
+
 /**
  * Contains the basic functionality for connection and communicating with the
  * coordination layer over JMS through active MQ.
@@ -83,27 +82,40 @@
 public class ActiveMQMessageBus implements MessageBus {
     private final Logger log = LoggerFactory.getLogger(getClass());
 
-    /** The key for storing the message type in a string property in the message headers. */
+    /**
+     * The key for storing the message type in a string property in the message headers.
+     */
     public static final String MESSAGE_TYPE_KEY = "org.bitrepository.messages.type";
-    /** The key for storing the BitRepositoryCollectionID in a string property in the message headers. */
+    /**
+     * The key for storing the BitRepositoryCollectionID in a string property in the message headers.
+     */
     public static final String COLLECTION_ID_KEY = "org.bitrepository.messages.collectionid";
-    /** The key for storing the message type in a string property in the message headers. */
+    /**
+     * The key for storing the message type in a string property in the message headers.
+     */
     public static final String MESSAGE_SIGNATURE_KEY = "org.bitrepository.messages.signature";
     public static final String MESSAGE_TO_KEY = "org.bitrepository.messages.to";
-    /** Default transacted. */
+    /**
+     * Default transacted.
+     */
     public static final boolean TRANSACTED = false;
 
-    /** The variable to separate the parts of the consumer key. */
+    /**
+     * The variable to separate the parts of the consumer key.
+     */
     private static final String CONSUMER_KEY_SEPARATOR = "#";
 
-    /** The session for sending messages. Should not be the same as the consumer session, 
+    /**
+     * The session for sending messages. Should not be the same as the consumer session,
      * as sessions are not thread safe. This also means the session should be used in a synchronized manor.
-     * TODO Switch to use a session pool/producer poll to allow multithreaded message sending, see 
+     * TODO Switch to use a session pool/producer poll to allow multithreaded message sending, see
      * https://sbforge.org/jira/browse/BITMAG-357.
      */
     private final Session producerSession;
 
-    /** The session for receiving messages. */
+    /**
+     * The session for receiving messages.
+     */
     private final Session consumerSession;
     private final String clientID;
 
@@ -113,11 +125,14 @@ public class ActiveMQMessageBus implements MessageBus {
      */
     private final Map<String, MessageConsumer> consumers = Collections
             .synchronizedMap(new HashMap<>());
-    /** Map of destinations, mapping from ID to destination. */
+    /**
+     * Map of destinations, mapping from ID to destination.
+     */
     private final Map<String, Destination> destinations = new HashMap<>();
-    /** The configuration for the connection to the activeMQ. */
+    /**
+     * The configuration for the connection to the activeMQ.
+     */
     private final MessageBusConfiguration configuration;
-    private String schemaLocation = "BitRepositoryMessages.xsd";
     private final JaxbHelper jaxbHelper;
     private final Connection connection;
     private final SecurityManager securityManager;
@@ -125,13 +140,20 @@ public class ActiveMQMessageBus implements MessageBus {
     private final Set<String> componentFilter = new HashSet<>();
     private final Set<String> collectionFilter = new HashSet<>();
 
-    /** The single producer used to send all messages. The destination need to be sent on the messages. */
+    /**
+     * The single producer used to send all messages. The destination need to be sent on the messages.
+     */
     private final MessageProducer producer;
-    /** Takes care of handling the further processing by the listeners in separated thread. */
+    /**
+     * Takes care of handling the further processing by the listeners in separated thread.
+     */
     private final ReceivedMessageHandler receivedMessageHandler;
 
-    /** ThreadFactory for any threads the activeMQ messagebus needs to create*/
-    private static final ThreadFactory threadFactory = new DefaultThreadFactory(ActiveMQMessageListener.class.getSimpleName()+"-", Thread.NORM_PRIORITY , false);
+    /**
+     * ThreadFactory for any threads the activeMQ messageBus needs to create
+     */
+    private static final ThreadFactory threadFactory = new DefaultThreadFactory(ActiveMQMessageListener.class.getSimpleName() + "-",
+            Thread.NORM_PRIORITY, false);
 
 
     /**
@@ -139,7 +161,7 @@ public class ActiveMQMessageBus implements MessageBus {
      * MessageBusConnections. This constructor is for the
      * <code>ProtocolComponentFactory</code> eyes only.
      *
-     * @param settings The settings to use.
+     * @param settings        The settings to use.
      * @param securityManager The security manager to use for message authentication.
      */
     public ActiveMQMessageBus(
@@ -149,6 +171,7 @@ public ActiveMQMessageBus(
         log.info("Initializing ActiveMQMessageBus:'" + configuration + "'.");
         this.securityManager = securityManager;
         clientID = settings.getComponentID();
+        String schemaLocation = "BitRepositoryMessages.xsd";
         jaxbHelper = new JaxbHelper("xsd/", schemaLocation);
         ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory(configuration.getURL());
         registerCustomMessageLoggers();
@@ -176,8 +199,8 @@ public ActiveMQMessageBus(
     }
 
     /**
-     * Start to listen for message on the message bus. This is done in a separate thread to avoid blocking, 
-     * so the main thread can continue without having to wait for the messagebus listening to start.
+     * Start to listen for message on the message bus. This is done in a separate thread to avoid blocking,
+     * so the main thread can continue without having to wait for the messageBus listening to start.
      */
     private void startListeningForMessages() {
         Thread connectionStarter = threadFactory.newThread(() -> {
@@ -197,7 +220,7 @@ public synchronized void addListener(String destinationID, final MessageListener
 
     @Override
     public synchronized void addListener(String destinationID, final MessageListener listener, boolean durable) {
-        log.debug("Adding " + (durable?"durable ":"") + "listener '{}' to destination: '{}' on message-bus '{}'.",
+        log.debug("Adding " + (durable ? "durable " : "") + "listener '{}' to destination: '{}' on message-bus '{}'.",
                 listener, destinationID, configuration.getName());
         MessageConsumer consumer = getMessageConsumer(destinationID, listener, durable);
         try {
@@ -214,7 +237,7 @@ public synchronized void removeListener(String destinationID, MessageListener li
                 "on message-bus '" + configuration + "'.");
         MessageConsumer consumer = getMessageConsumer(destinationID, listener, false);
         try {
-            // We need to set the listener to null to have the removeListerer take effect at once. 
+            // We need to set the listener to null to have the removeListener take effect at once.
             // If this isn't done the listener will continue to receive messages. Do we have a memory leak here? 
             consumer.setMessageListener(null);
             consumer.close();
@@ -246,7 +269,7 @@ public void sendMessage(Message content) {
 
     /**
      * Send a message using ActiveMQ.
-     *
+     * <p/>
      * Note that the method is synchronized to avoid multithreaded usage of the providerSession.
      *
      * @param destinationID Name of destination to send message to.
@@ -269,8 +292,8 @@ private synchronized void sendMessage(String destinationID,
             log.trace("The following message is sent to the destination '" + destinationID + "'" + " on message-bus '"
                     + configuration.getName() + "': \n{}", xmlContent);
 
-            javax.jms.Message msg = producerSession.createTextMessage(xmlContent);
-            String stringData = ((TextMessage) msg).getText();
+            TextMessage msg = producerSession.createTextMessage(xmlContent);
+            String stringData = msg.getText();
             String messageSignature = securityManager.signMessage(stringData);
             msg.setStringProperty(MESSAGE_SIGNATURE_KEY, messageSignature);
             msg.setStringProperty(MESSAGE_TYPE_KEY, content.getClass().getSimpleName());
@@ -310,7 +333,7 @@ private MessageConsumer getMessageConsumer(String destinationID, MessageListener
             try {
                 if (durable) {
                     if (destination instanceof Topic) {
-                        Topic topic = (Topic)destination;
+                        Topic topic = (Topic) destination;
                         consumer = consumerSession.createDurableSubscriber(topic, clientID);
                     } else {
                         throw new IllegalArgumentException("Can not create durable subscriber on " + destinationID +
@@ -342,7 +365,7 @@ private String getConsumerHash(String destinationID, MessageListener listener) {
      * Given a destination ID, retrieve the destination object.
      *
      * @param destinationID ID of the destination.
-     * @param session session
+     * @param session       session
      * @return The object representing that destination. Will always return the same destination object for the same destination ID.
      */
     private Destination getDestination(String destinationID, Session session) {
@@ -380,7 +403,9 @@ private Destination getDestination(String destinationID, Session session) {
         return destination;
     }
 
-    /** Class for handling the message bus exceptions. */
+    /**
+     * Class for handling the message bus exceptions.
+     */
     private class MessageBusExceptionListener implements ExceptionListener {
         @Override
         public void onException(JMSException arg0) {
@@ -390,16 +415,20 @@ public void onException(JMSException arg0) {
 
     /**
      * Adapter from Active MQ message listener to message listener.
-     *
+     * <p>
      * This adapts from general Active MQ messages to the types.
      */
     private class ActiveMQMessageListener implements javax.jms.MessageListener {
-        /** The Log. */
-        private Logger log = LoggerFactory.getLogger(getClass());
+        /**
+         * The Log.
+         */
+        private final Logger log = LoggerFactory.getLogger(getClass());
 
-        /** The message listener that receives the messages. */
+        /**
+         * The message listener that receives the messages.
+         */
         private final MessageListener messageListener;
-        
+
         /**
          * Initialise the adapter from ActiveMQ message listener .
          *
@@ -411,7 +440,7 @@ public ActiveMQMessageListener(MessageListener listener) {
 
         /**
          * When receiving the message, call the appropriate method on the message listener.
-         *
+         * <p>
          * This method acts as a fault barrier for all exceptions from message
          * reception. They are all logged as warnings, but otherwise ignored.
          *
@@ -425,14 +454,14 @@ public void onMessage(final javax.jms.Message jmsMessage) {
                 String recipientID = jmsMessage.getStringProperty(MESSAGE_TO_KEY);
                 type = jmsMessage.getStringProperty(MESSAGE_TYPE_KEY);
                 if (type.startsWith("Identify") && type.endsWith("Request")) {
-                    if(!componentFilter.isEmpty()) {
+                    if (!componentFilter.isEmpty()) {
                         if (recipientID != null && !componentFilter.contains(recipientID)) {
                             log.trace("Ignoring " + type + " message to other component " + recipientID);
                             return;
                         }
                     }
                     String collectionID = jmsMessage.getStringProperty(COLLECTION_ID_KEY);
-                    if(!collectionFilter.isEmpty()) {
+                    if (!collectionFilter.isEmpty()) {
                         if (collectionID != null && !collectionFilter.contains(collectionID)) {
                             log.trace("Ignoring message to unknown collection " + collectionID);
                             return;
@@ -470,7 +499,7 @@ public void onMessage(final javax.jms.Message jmsMessage) {
         }
     }
 
-    // This should be done on a per module basis, but how?
+    // This should be done on a per-module basis, but how?
     private void registerCustomMessageLoggers() {
         MessageLoggerProvider loggerProvider = MessageLoggerProvider.getInstance();
         loggerProvider.registerLogger(OperationType.GET_FILE, new GetFileMessageLogger());
@@ -481,7 +510,7 @@ private void registerCustomMessageLoggers() {
         loggerProvider.registerLogger(OperationType.GET_CHECKSUMS, new GetChecksumsMessageLogger());
         loggerProvider.registerLogger(OperationType.GET_AUDIT_TRAILS, new GetAuditTrailsMessageLogger());
         loggerProvider.registerLogger(OperationType.GET_STATUS, new GetStatusMessageLogger());
-        loggerProvider.registerLogger(Arrays.asList("AlarmMessage"), new AlarmMessageLogger());
+        loggerProvider.registerLogger(List.of("AlarmMessage"), new AlarmMessageLogger());
     }
 
     @Override
diff --git a/bitrepository-core/src/main/java/org/bitrepository/protocol/http/HttpFileExchange.java b/bitrepository-core/src/main/java/org/bitrepository/protocol/http/HttpFileExchange.java
index aa7484664..f4ca514a7 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/protocol/http/HttpFileExchange.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/protocol/http/HttpFileExchange.java
@@ -1,44 +1,29 @@
 /*
  * #%L
  * Bitmagasin Protocol
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.protocol.http;
 
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.net.URLEncoder;
-
 import org.apache.http.HttpResponse;
 import org.apache.http.client.methods.HttpDelete;
 import org.apache.http.client.methods.HttpPut;
@@ -58,34 +43,37 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/**
- * Simple interface for data transfer between an application and a HTTP server.
- */
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+
 public class HttpFileExchange implements FileExchange {
     private final Logger log = LoggerFactory.getLogger(getClass());
-    
-    /** The lower boundary for the error codes of the HTTP codes.*/
     private static final int HTTP_ERROR_CODE_BARRIER = 300;
-    /** Default buffer size 1MB */
     protected int HTTP_BUFFER_SIZE = 1024 * 1024;
-    /** Default chunk size 64K */
     protected static final int HTTP_CHUNK_SIZE = 64 * 1024;
-    /** The settings for the file exchange.*/
     protected final Settings settings;
-    
-    /**
-     * Initialise HTTP file exchange.
-     * @param settings The settings regarding the file exchange through HTTP.
-     */
+
     public HttpFileExchange(Settings settings) {
         this.settings = settings;
     }
-    
+
     @Override
     public void putFile(InputStream in, URL url) throws IOException {
         performUpload(in, url);
     }
-    
+
     @Override
     public InputStream getFile(URL url) throws IOException {
         return retrieveStream(url);
@@ -93,72 +81,67 @@ public InputStream getFile(URL url) throws IOException {
 
     @Override
     public URL putFile(File dataFile) {
-        if(dataFile == null) {
+        if (dataFile == null) {
             throw new IllegalArgumentException("The datafile may not be null.");
         }
-        if(!dataFile.isFile()) {
-            throw new IllegalArgumentException("The datafile '" 
-                    + dataFile.getPath() + "' is not a proper file.");
+        if (!dataFile.isFile()) {
+            throw new IllegalArgumentException("The datafile '" + dataFile.getPath() + "' is not a proper file.");
         }
-        
+
         try {
             // generate the URL for the file.
             URL url = getURL(dataFile.getName());
-            
-            try (InputStream in = new BufferedInputStream(new FileInputStream(dataFile), HTTP_BUFFER_SIZE)){
+
+            try (InputStream in = new BufferedInputStream(new FileInputStream(dataFile), HTTP_BUFFER_SIZE)) {
                 performUpload(in, url);
             }
             return url;
         } catch (IOException e) {
-            throw new CoordinationLayerException("Could not upload the file '"
-                    + dataFile.getAbsolutePath() + "' to the server." , e);
+            throw new CoordinationLayerException("Could not upload the file '" + dataFile.getAbsolutePath() + "' to the server.", e);
         }
     }
-    
+
     @Override
-    public void getFile(OutputStream out, URL url)
-            throws IOException {
+    public void getFile(OutputStream out, URL url) throws IOException {
         performDownload(out, url);
     }
-    
+
     @Override
     public void getFile(File outputFile, String fileAddress) {
         try {
-            // retrieve the url and the outputstream for the file.
+            // retrieve the url and the output-stream for the file.
             URL url = new URL(fileAddress);
             try (OutputStream out = new BufferedOutputStream(new FileOutputStream(outputFile))) {
                 // download the file.
                 performDownload(out, url);
             }
         } catch (IOException e) {
-            throw new CoordinationLayerException("Could not download data "
-                    + "from '" + fileAddress + "' to the file '" 
-                    + outputFile.getAbsolutePath() + "'.", e);
+            throw new CoordinationLayerException(
+                    "Could not download data " + "from '" + fileAddress + "' to the file '" + outputFile.getAbsolutePath() + "'.", e);
         }
     }
-    
+
     /**
-     * Retrieves the data from a given url and puts it onto a given 
-     * outputstream. It has to be a 'HTTP' url, since the data is retrieved 
+     * Retrieves the data from a given url and puts it onto a given
+     * output-stream. It has to be a 'HTTP' url, since the data is retrieved
      * through a HTTP-request.
-     * 
+     *
      * @param out The output stream to put the data.
      * @param url The url for where the data should be retrieved.
-     * @throws IOException If any problems occurs during the retrieval of the 
-     * data.
+     * @throws IOException If any problems occurs during the retrieval of the
+     *                     data.
      */
-    protected void performDownload(OutputStream out, URL url)
-            throws IOException {
-        if(out == null || url == null) {
-            throw new IllegalArgumentException("OutputStream out: '" + out
-                    + "', URL: '" + url + "'");
+    protected void performDownload(OutputStream out, URL url) throws IOException {
+        if (out == null || url == null) {
+            throw new IllegalArgumentException("OutputStream out: '" + out + "', URL: '" + url + "'");
         }
         InputStream is = retrieveStream(url);
         StreamUtils.copyInputStreamToOutputStream(is, out);
     }
-    
+
     /**
      * Retrieves the Input stream for a given URL.
+     *
      * @param url The URL to retrieve.
      * @return The InputStream to the given URL.
      * @throws IOException If any problems occurs during the retrieval.
@@ -169,24 +152,24 @@ protected InputStream retrieveStream(URL url) throws IOException {
         conn.setRequestMethod("GET");
         return conn.getInputStream();
     }
-    
+
     /**
      * Method for putting data on the HTTP-server of a given url.
-     * 
-     * TODO perhaps make it synchronized around the URL, to prevent data from 
-     * trying to uploaded several times to the same location simultaneously. 
-     * Though it would not prevent synchronous upload from independent machines or JVMs. 
-     * 
-     * @param in The data to put into the url.
+     * <p>
+     * TODO perhaps make it synchronized around the URL, to prevent data from
+     * trying to uploaded several times to the same location simultaneously.
+     * Though it would not prevent synchronous upload from independent machines or JVMs.
+     *
+     * @param in  The data to put into the url.
      * @param url The place to put the data.
-     * @throws IOException If a problem with the connection occurs during the 
-     * transaction. Also if the response code is 300 or above, which indicates
-     * that the transaction has not been successful.
+     * @throws IOException If a problem with the connection occurs during the
+     *                     transaction. If the response code is 300 or above, which indicates
+     *                     that the transaction has not been successful.
      */
     private void performUpload(InputStream in, URL url) throws IOException {
         ArgumentValidator.checkNotNull(in, "InputStream in");
         ArgumentValidator.checkNotNull(url, "URL url");
-        
+
 
         try (CloseableHttpClient httpClient = getHttpClient()) {
             HttpPut httpPut = new HttpPut(url.toExternalForm());
@@ -196,35 +179,29 @@ private void performUpload(InputStream in, URL url) throws IOException {
             HttpResponse response = httpClient.execute(httpPut);
 
             // HTTP code >= 300 means error!
-            if(response.getStatusLine().getStatusCode() >= HTTP_ERROR_CODE_BARRIER) {
-                throw new IOException("Could not upload file to URL '" + url.toExternalForm() + "'. got status code '" 
-                        + response.getStatusLine() + "'");
+            if (response.getStatusLine().getStatusCode() >= HTTP_ERROR_CODE_BARRIER) {
+                throw new IOException(
+                        "Could not upload file to URL '" + url.toExternalForm() + "'. got status code '" + response.getStatusLine() + "'");
             }
-            log.debug("Uploaded datastream to url '" + url.toString() + "' and "
-                    + "received the response line '" + response.getStatusLine() + "'.");
+            log.debug("Uploaded data-stream to url '" + url + "' and " + "received the response line '" + response.getStatusLine() + "'.");
         }
     }
-    
+
     @Override
     public URL getURL(String filename) throws MalformedURLException {
         ArgumentValidator.checkNotNullOrEmpty(filename, "String fileName");
-        ArgumentValidator.checkNotNull(settings.getReferenceSettings().getFileExchangeSettings(), 
+        ArgumentValidator.checkNotNull(settings.getReferenceSettings().getFileExchangeSettings(),
                 "The ReferenceSettings are missing the settings for the file exchange.");
         FileExchangeSettings feSettings = settings.getReferenceSettings().getFileExchangeSettings();
-        try {
-            String urlEncodedFilename = URLEncoder.encode(filename, "UTF-8");
+        String urlEncodedFilename = URLEncoder.encode(filename, StandardCharsets.UTF_8);
 
-            URL res = new URL(feSettings.getProtocolType().value(), feSettings.getServerName(), 
-                    feSettings.getPort().intValue(), feSettings.getPath() + "/" + urlEncodedFilename);
-            return res;
-        } catch (UnsupportedEncodingException e) {
-            throw new IllegalStateException("Cannot create the URL.", e);
-        }
+        return new URL(feSettings.getProtocolType().value(), feSettings.getServerName(), feSettings.getPort().intValue(),
+                feSettings.getPath() + "/" + urlEncodedFilename);
     }
-    
+
     /**
-     * Method for opening a HTTP connection to the given URL.
-     * 
+     * Method for opening an HTTP connection to the given URL.
+     *
      * @param url The URL to open the connection to.
      * @return The HTTP connection to the given URL.
      */
@@ -235,22 +212,20 @@ protected HttpURLConnection getConnection(URL url) {
             throw new CoordinationLayerException("Could not open the connection to the url '" + url + "'", e);
         }
     }
-    
+
     /**
      * Retrieves the HttpClient with the correct setup.
      * For HTTPS this should be overridden with SSL context.
+     *
      * @return The HttpClient for this FileExchange.
      */
     protected CloseableHttpClient getHttpClient() {
         HttpClientBuilder builder = HttpClients.custom();
-        PoolingHttpClientConnectionManager poolingmgr = new PoolingHttpClientConnectionManager(
+        PoolingHttpClientConnectionManager connectionManager = new PoolingHttpClientConnectionManager(
                 new ChunkyManagedHttpClientConnectionFactory(HTTP_CHUNK_SIZE));
-        SocketConfig socketConfig = SocketConfig.custom()
-                .setSndBufSize(HTTP_BUFFER_SIZE)
-                .setRcvBufSize(HTTP_BUFFER_SIZE)
-                .build();
-        poolingmgr.setDefaultSocketConfig(socketConfig);
-        builder.setConnectionManager(poolingmgr);
+        SocketConfig socketConfig = SocketConfig.custom().setSndBufSize(HTTP_BUFFER_SIZE).setRcvBufSize(HTTP_BUFFER_SIZE).build();
+        connectionManager.setDefaultSocketConfig(socketConfig);
+        builder.setConnectionManager(connectionManager);
         return builder.build();
     }
 
diff --git a/bitrepository-core/src/main/java/org/bitrepository/protocol/http/HttpsFileExchange.java b/bitrepository-core/src/main/java/org/bitrepository/protocol/http/HttpsFileExchange.java
index b548023b6..3a5706e87 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/protocol/http/HttpsFileExchange.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/protocol/http/HttpsFileExchange.java
@@ -1,23 +1,23 @@
 /*
  * #%L
  * Bitmagasin Protocol
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -47,26 +47,19 @@
 import java.net.URL;
 import java.security.NoSuchAlgorithmException;
 
-/**
- * Simple interface for data transfer between an application and a HTTPS server.
- */
+
 public class HttpsFileExchange extends HttpFileExchange {
-    /** The verifier for all the hostnames.*/
     private final HostnameVerifier hostnameVerifier;
-    
-    /**
-     * Initialise HTTP file exchange.
-     * @param settings The settings regarding the file exchange through HTTP.
-     */
+
     public HttpsFileExchange(Settings settings) {
         super(settings);
         hostnameVerifier = NoopHostnameVerifier.INSTANCE;
     }
-    
+
     /**
      * Method for opening a HTTP connection to the given URL.
      * TODO needs some SSL stuff??
-     * 
+     *
      * @param url The URL to open the connection to.
      * @return The HTTP connection to the given URL.
      */
@@ -91,7 +84,7 @@ protected CloseableHttpClient getHttpClient() {
                             SSLContext.getDefault(),
                             hostnameVerifier))
                     .build();
-            final PoolingHttpClientConnectionManager poolingmgr = new PoolingHttpClientConnectionManager(
+            final PoolingHttpClientConnectionManager connectionManager = new PoolingHttpClientConnectionManager(
                     socketFactoryRegistry,
                     new ChunkyManagedHttpClientConnectionFactory(HTTP_CHUNK_SIZE),
                     SystemDefaultDnsResolver.INSTANCE);
@@ -100,13 +93,13 @@ protected CloseableHttpClient getHttpClient() {
                     .setSoKeepAlive(true)
                     .setSndBufSize(HTTP_BUFFER_SIZE)
                     .setRcvBufSize(HTTP_BUFFER_SIZE).build();
-            poolingmgr.setDefaultSocketConfig(socketConfig);
+            connectionManager.setDefaultSocketConfig(socketConfig);
 
-            builder.setConnectionManager(poolingmgr);
+            builder.setConnectionManager(connectionManager);
         } catch (NoSuchAlgorithmException e) {
             throw new IllegalStateException("Could not make Https Client.", e);
         }
-    
+
         return builder.build();
     }
 }
diff --git a/bitrepository-core/src/main/java/org/bitrepository/protocol/http/LargeChunkedInputStreamEntity.java b/bitrepository-core/src/main/java/org/bitrepository/protocol/http/LargeChunkedInputStreamEntity.java
index 8110f4691..41bddb7cb 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/protocol/http/LargeChunkedInputStreamEntity.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/protocol/http/LargeChunkedInputStreamEntity.java
@@ -8,12 +8,12 @@
  * it under the terms of the GNU Lesser General Public License as
  * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
@@ -21,67 +21,64 @@
  */
 package org.bitrepository.protocol.http;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
 import org.apache.http.entity.ContentType;
 import org.apache.http.entity.InputStreamEntity;
 import org.apache.http.util.Args;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
 /**
- * Class to send larger chunks of data per read/write cycle. 
+ * Class to send larger chunks of data per read/write cycle.
  * InputStreamEntity sends 4k per cycle which incurs a penalty in environments with a
- * non-low latency. 
- * This class amends the issue by using a larger buffer. 
+ * non-low latency.
+ * This class amends the issue by using a larger buffer.
  */
 public class LargeChunkedInputStreamEntity extends InputStreamEntity {
 
-    private final static int OUTPUT_BUFFER_SIZE = 128 * 1024; 
-    
-    public LargeChunkedInputStreamEntity(InputStream instream, long length) {
-        super(instream, length);
+    private final static int OUTPUT_BUFFER_SIZE = 128 * 1024;
+
+    public LargeChunkedInputStreamEntity(InputStream inputStream, long length) {
+        super(inputStream, length);
     }
 
-    public LargeChunkedInputStreamEntity(InputStream instream, ContentType contentType) {
-        super(instream, contentType);
+    public LargeChunkedInputStreamEntity(InputStream inputStream, ContentType contentType) {
+        super(inputStream, contentType);
     }
 
-    public LargeChunkedInputStreamEntity(InputStream instream, long length, ContentType contentType) {
-        super(instream, length, contentType);
+    public LargeChunkedInputStreamEntity(InputStream inputStream, long length, ContentType contentType) {
+        super(inputStream, length, contentType);
     }
 
-    public LargeChunkedInputStreamEntity(InputStream instream) {
-        super(instream);
+    public LargeChunkedInputStreamEntity(InputStream inputStream) {
+        super(inputStream);
     }
 
     @Override
-    public void writeTo(final OutputStream outstream) throws IOException {
-        Args.notNull(outstream, "Output stream");
-        final InputStream instream = getContent();
-        final long length = getContentLength();
-        try {
+    public void writeTo(final OutputStream outputStream) throws IOException {
+        Args.notNull(outputStream, "Output stream");
+        try (InputStream inputStream = getContent()) {
+            final long length = getContentLength();
             final byte[] buffer = new byte[OUTPUT_BUFFER_SIZE];
             int l;
             if (length < 0) {
                 // consume until EOF
-                while ((l = instream.read(buffer)) != -1) {
-                    outstream.write(buffer, 0, l);
+                while ((l = inputStream.read(buffer)) != -1) {
+                    outputStream.write(buffer, 0, l);
                 }
             } else {
                 // consume no more than length
                 long remaining = length;
                 while (remaining > 0) {
-                    l = instream.read(buffer, 0, (int)Math.min(OUTPUT_BUFFER_SIZE, remaining));
+                    l = inputStream.read(buffer, 0, (int) Math.min(OUTPUT_BUFFER_SIZE, remaining));
                     if (l == -1) {
                         break;
                     }
-                    outstream.write(buffer, 0, l);
+                    outputStream.write(buffer, 0, l);
                     remaining -= l;
                 }
             }
-        } finally {
-            instream.close();
         }
     }
 }
diff --git a/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/MessageBus.java b/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/MessageBus.java
index 29d86adda..01c05bfc3 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/MessageBus.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/MessageBus.java
@@ -1,23 +1,23 @@
 /*
  * #%L
  * Bitmagasin integrationstest
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -31,13 +31,13 @@
 /**
  * The communication interface for the message bus.
  */
-public interface MessageBus extends MessageSender, AutoCloseable{
+public interface MessageBus extends MessageSender, AutoCloseable {
     /**
      * Adds the supplied listener to the indicated destination (non-durable).
      *
      * @param destinationId The destination to listen to
      * @param listener      The listener with should handle the messages
-     *                      arriving on the destination
+     *                      arriving at the destination
      */
     void addListener(String destinationId, MessageListener listener);
 
@@ -46,7 +46,7 @@ public interface MessageBus extends MessageSender, AutoCloseable{
      *
      * @param destinationID The destination to listen to
      * @param listener      The listener with should handle the messages
-     *                      arriving on the destination
+     *                      arriving at the destination
      * @param durable       Indicates whether the lister should use a durable subscriber. Only allowed for topics and
      *                      only relevant if the consumer needs to be created.
      */
@@ -62,32 +62,31 @@ public interface MessageBus extends MessageSender, AutoCloseable{
     void removeListener(String destinationId, MessageListener listener);
 
     /**
-     * Closes the messagebus connection so that everything can be shutdown nicely.
+     * Closes the message bus connection so that everything can be shutdown nicely.
+     *
      * @throws JMSException If the MessageBus cannot be closed
      */
     void close() throws JMSException;
 
     /**
-     * @param componentIDs Defines the list of componentIDs with receiver component ID relevant for this messagebus instance. If
-     * the list contains any elements, the receiverID for incoming messages are read before being parsed. This enables
-     * the message bus to discard messages prior to parsing, if the message is meant for other components.
-     * <p>
-     * Messages will only be discarded if the componentFilter contains at least one componentID and the received
-     * message has a defined receiver.
-     * </p>
-     *
+     * @param componentIDs Defines the list of componentIDs with receiver component ID relevant for this message bus instance. If
+     *                     the list contains any elements, the receiverID for incoming messages are read before being parsed. This enables
+     *                     the message bus to discard messages prior to parsing, if the message is meant for other components.
+     *                     <p>
+     *                     Messages will only be discarded if the componentFilter contains at least one componentID and the received
+     *                     message has a defined receiver.
+     *                     </p>
      */
     void setComponentFilter(List<String> componentIDs);
 
     /**
      * @param collectionIDs If defined specifies the list of collectionIDs with should be handled. If
-     * the list contains any elements, the collectionID for incoming messages are read before being parsed. This
-     * enables the message bus to discard messages prior to parsing, if the message is meant for other collections.
-     * <p>
-     * Messages will only be discarded if the collection contains at least one collectionsID and the received
-     * message has a defined collectionID.
-     * </p>
-     *
+     *                      the list contains any elements, the collectionID for incoming messages are read before being parsed. This
+     *                      enables the message bus to discard messages prior to parsing, if the message is meant for other collections.
+     *                      <p>
+     *                      Messages will only be discarded if the collection contains at least one collectionsID and the received
+     *                      message has a defined collectionID.
+     *                      </p>
      */
     void setCollectionFilter(List<String> collectionIDs);
 }
diff --git a/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/MessageBusManager.java b/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/MessageBusManager.java
index b5373e14d..e8f136b63 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/MessageBusManager.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/MessageBusManager.java
@@ -1,40 +1,40 @@
 /*
  * #%L
  * Bitrepository Protocol
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.protocol.messagebus;
 
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-import javax.jms.JMSException;
-
 import org.bitrepository.common.settings.Settings;
 import org.bitrepository.protocol.activemq.ActiveMQMessageBus;
 import org.bitrepository.protocol.security.SecurityManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.jms.JMSException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * The place to get message buses. Only one message bus is created for each collection ID.
  */
@@ -46,13 +46,16 @@ public final class MessageBusManager {
      * Map of the loaded mediators for the different collectionsIDs.
      * The keys are the collectionID and the values are the message buses
      */
-    private static final Map<String,MessageBus> messageBusMap = new HashMap<>();
-    
-    /** Do not instantiate */
-    private MessageBusManager() {}
+    private static final Map<String, MessageBus> messageBusMap = new HashMap<>();
 
     /**
-     * @param settings the message bus settings
+     * Do not instantiate
+     */
+    private MessageBusManager() {
+    }
+
+    /**
+     * @param settings        the message bus settings
      * @param securityManager the security manager
      * @return A the default message bus instance based on the supplied configuration. If the default message bus
      * doesn't already exist, it is created.
@@ -61,47 +64,45 @@ public synchronized static MessageBus getMessageBus(Settings settings, SecurityM
         if (!messageBusMap.containsKey(DEFAULT_MESSAGE_BUS)) {
             MessageBus messageBus = createMessageBus(settings, securityManager);
             messageBusMap.put(DEFAULT_MESSAGE_BUS, messageBus);
-            messageBus.setComponentFilter(Arrays.asList(new String[] {settings.getComponentID()}));
+            messageBus.setComponentFilter(List.of(settings.getComponentID()));
         }
         return messageBusMap.get(DEFAULT_MESSAGE_BUS);
     }
 
     /**
-     * @return a messagebus for the given collection if it exists, else null.
+     * @return a message bus for the given collection if it exists, else null.
      */
     public synchronized static MessageBus getMessageBus() {
         return messageBusMap.get(DEFAULT_MESSAGE_BUS);
     }
 
-    private static MessageBus createMessageBus(
-            Settings settings,
-            SecurityManager securityManager) {
-        ActiveMQMessageBus messageBus = new ActiveMQMessageBus(settings, securityManager);
-        return messageBus;
+    private static MessageBus createMessageBus(Settings settings, SecurityManager securityManager) {
+        return new ActiveMQMessageBus(settings, securityManager);
     }
 
     /**
      * Can be used to inject a custom messageBus for a specific name.
-     * @param name a specific name
-     * @param messageBus The custom instance of the messagebus.
+     *
+     * @param name       a specific name
+     * @param messageBus The custom instance of the message bus.
      */
     public static void injectCustomMessageBus(String name, MessageBus messageBus) {
         messageBusMap.put(name, messageBus);
     }
 
     /**
-     * Can be used to clear the current messagebuses, eg. new messagebuses will be created on access.
-     *
-     * All messagebusses will be closed.
+     * Can be used to clear the current message buses, e.g. new message buses will be created on access.
+     * <p/>
+     * All message busses will be closed.
      */
     public static void clear() {
-        messageBusMap.clear();
-        for (MessageBus bus:messageBusMap.values()) {
+        for (MessageBus bus : messageBusMap.values()) {
             try {
                 bus.close();
             } catch (JMSException e) {
-                log.warn("Failed to close messagebus " + bus + " during clear()");
+                log.warn("Failed to close message bus " + bus + " during clear()");
             }
         }
+        messageBusMap.clear();
     }
 }
diff --git a/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/MessageListener.java b/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/MessageListener.java
index a4a1ba947..177e7df12 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/MessageListener.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/MessageListener.java
@@ -1,23 +1,23 @@
 /*
  * #%L
  * Bitrepository Protocol
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -28,15 +28,16 @@
 import org.bitrepository.protocol.MessageContext;
 
 
-/** Defines a consumer of messages.
- *
+/**
+ * Defines a consumer of messages.
+ * <p>
  * If an implementation does not support a method, it may throw {@link UnsupportedOperationException}
  */
 public interface MessageListener {
     /**
      * Action to perform upon receiving a general message.
      *
-     * @param message The message received.
+     * @param message        The message received.
      * @param messageContext Includes information about the message not already included in the message object.
      */
     void onMessage(Message message, MessageContext messageContext);
diff --git a/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/MessageSender.java b/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/MessageSender.java
index d7cbd8669..17f6f9a2a 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/MessageSender.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/MessageSender.java
@@ -1,23 +1,23 @@
 /*
  * #%L
  * Bitrepository Protocol
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
diff --git a/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/ReceivedMessageHandler.java b/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/ReceivedMessageHandler.java
index 6afaf13b6..014ec6f4e 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/ReceivedMessageHandler.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/ReceivedMessageHandler.java
@@ -8,12 +8,12 @@
  * it under the terms of the GNU Lesser General Public License as
  * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
@@ -21,14 +21,6 @@
  */
 package org.bitrepository.protocol.messagebus;
 
-import java.math.BigInteger;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ThreadFactory;
-
 import org.bitrepository.bitrepositorymessages.Message;
 import org.bitrepository.common.DefaultThreadFactory;
 import org.bitrepository.protocol.MessageContext;
@@ -39,13 +31,21 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.math.BigInteger;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadFactory;
+
 /**
  * Takes care of handling the further processing by the listeners in separated thread.
  */
 public class ReceivedMessageHandler {
     private final Logger log = LoggerFactory.getLogger(getClass());
     private final ExecutorModel executorModel;
-    private final ThreadFactory threadFactory = new DefaultThreadFactory("ReceivedMessageHandler-", Thread.NORM_PRIORITY ,false);
+    private final ThreadFactory threadFactory = new DefaultThreadFactory("ReceivedMessageHandler-", Thread.NORM_PRIORITY, false);
 
     public ReceivedMessageHandler(MessageThreadPools messageThreadPools) {
         executorModel = new ExecutorModel(messageThreadPools);
@@ -53,14 +53,15 @@ public ReceivedMessageHandler(MessageThreadPools messageThreadPools) {
 
     /**
      * Making the handling of the message be performed in parallel.
-     * @param listener The listener with should perform the actual processing of the message.
-     * @param message The message to be handled by the MessageListener.
+     *
+     * @param listener       The listener with should perform the actual processing of the message.
+     * @param message        The message to be handled by the MessageListener.
      * @param messageContext passed to the message listener.
      */
     public void deliver(MessageListener listener, Message message, MessageContext messageContext) {
         MessageProcessor processor = new MessageProcessor(listener, message, messageContext);
-        executorModel.retrieveExecuter(message).execute(processor);
-            }
+        executorModel.retrieveExecutor(message).execute(processor);
+    }
 
     /**
      * Use this to close down the running executors.
@@ -73,16 +74,20 @@ public void close() {
     /**
      * Simple class to run the delivery of messages by the message listener.
      */
-    private class MessageProcessor implements Runnable {
-        /** The message listener.*/
+    private static class MessageProcessor implements Runnable {
+        /**
+         * The message listener.
+         */
         private final MessageListener listener;
-        /** The message for the listener to handle.*/
+        /**
+         * The message for the listener to handle.
+         */
         private final Message message;
         private final MessageContext messageContext;
 
         /**
-         * @param listener The MessageListener to handle the message.
-         * @param message The message to be handled by the MessageListener.
+         * @param listener       The MessageListener to handle the message.
+         * @param message        The message to be handled by the MessageListener.
          * @param messageContext the message context
          */
         MessageProcessor(MessageListener listener, Message message, MessageContext messageContext) {
@@ -107,13 +112,14 @@ private class ExecutorModel {
 
         /**
          * Creates the different executor services based on the supplied configuration.
+         *
          * @param messageThreadPools the thread pools of the message system
          */
         ExecutorModel(MessageThreadPools messageThreadPools) {
             if (messageThreadPools != null) {
                 for (MessageThreadPool messageThreadPool : messageThreadPools.getMessageThreadPool()) {
                     List<String> collections = messageThreadPool.getCollection();
-                    if (collections != null  && !collections.isEmpty()) {
+                    if (collections != null && !collections.isEmpty()) {
                         for (String collection : collections) {
                             if (!collectionExecutorModelMap.containsKey(collection)) {
                                 collectionExecutorModelMap.put(collection, new CollectionExecutorModel());
@@ -132,22 +138,22 @@ private class ExecutorModel {
             if (defaultCollectionExecutorModel == null) {
                 defaultCollectionExecutorModel = new CollectionExecutorModel();
             }
-            if (defaultCollectionExecutorModel.defaultexecutor == null) {
-                defaultCollectionExecutorModel.defaultexecutor = Executors.newCachedThreadPool(threadFactory);
+            if (defaultCollectionExecutorModel.defaultExecutor == null) {
+                defaultCollectionExecutorModel.defaultExecutor = Executors.newCachedThreadPool(threadFactory);
             }
         }
 
-        ExecutorService retrieveExecuter(Message message) {
+        ExecutorService retrieveExecutor(Message message) {
             ExecutorService executor = null;
             if (message.getCollectionID() != null) {
                 CollectionExecutorModel collectionExecutorModel =
                         collectionExecutorModelMap.get(message.getCollectionID());
                 if (collectionExecutorModel != null) {
-                    executor = collectionExecutorModel.retrieveExecuter(message);
+                    executor = collectionExecutorModel.retrieveExecutor(message);
                 }
             }
             if (executor == null) {
-                executor = defaultCollectionExecutorModel.retrieveExecuter(message);
+                executor = defaultCollectionExecutorModel.retrieveExecutor(message);
             }
             return executor;
         }
@@ -164,7 +170,7 @@ private ExecutorService createExecutorService(BigInteger poolSize) {
             } else if (poolSize.intValue() == 1) {
                 return Executors.newSingleThreadExecutor(threadFactory);
             } else {
-                return Executors.newFixedThreadPool(poolSize.intValue(),threadFactory);
+                return Executors.newFixedThreadPool(poolSize.intValue(), threadFactory);
             }
         }
 
@@ -172,7 +178,7 @@ private ExecutorService createExecutorService(BigInteger poolSize) {
          * Contain the executors for a single collection.
          */
         private class CollectionExecutorModel {
-            private ExecutorService defaultexecutor;
+            private ExecutorService defaultExecutor;
             private final Map<MessageCategory, ExecutorService> categoryExecutorMap = new HashMap<>();
             private final Map<String, ExecutorService> messageExecutorMap = new HashMap<>();
 
@@ -187,25 +193,25 @@ void addPool(MessageThreadPool messageThreadPool) {
                 } else if (messageCategory != null) {
                     categoryExecutorMap.put(messageCategory, executor);
                 } else {
-                    defaultexecutor = executor;
+                    defaultExecutor = executor;
                 }
             }
 
-            ExecutorService retrieveExecuter(Message message) {
+            ExecutorService retrieveExecutor(Message message) {
                 ExecutorService executor = messageExecutorMap.get(message.getClass().getSimpleName());
                 if (executor == null) {
                     MessageCategory messageCategory = MessageCategoryUtils.getCategory(message);
-                    executor =  categoryExecutorMap.get(messageCategory);
+                    executor = categoryExecutorMap.get(messageCategory);
                 }
                 if (executor == null) {
-                    executor = defaultexecutor;
+                    executor = defaultExecutor;
                 }
                 return executor;
             }
 
             void shutdown() {
-                if (defaultexecutor != null) {
-                    defaultexecutor.shutdown();
+                if (defaultExecutor != null) {
+                    defaultExecutor.shutdown();
                 }
 
                 for (ExecutorService executor : messageExecutorMap.values()) {
diff --git a/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/SimpleMessageBus.java b/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/SimpleMessageBus.java
index 55e014b6e..23db80c29 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/SimpleMessageBus.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/SimpleMessageBus.java
@@ -8,12 +8,12 @@
  * it under the terms of the GNU Lesser General Public License as
  * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
@@ -24,16 +24,15 @@
 import org.bitrepository.bitrepositorymessages.Message;
 import org.bitrepository.protocol.MessageContext;
 
+import javax.jms.JMSException;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import javax.jms.JMSException;
-
 public class SimpleMessageBus implements MessageBus {
-    Map<String,Set<MessageListener>> listeners = new HashMap<>();
+    Map<String, Set<MessageListener>> listeners = new HashMap<>();
     private final Set<String> componentFilter = new HashSet<>();
     private final Set<String> collectionFilter = new HashSet<>();
 
@@ -53,7 +52,8 @@ public void removeListener(String destinationId, MessageListener listener) {
     }
 
     @Override
-    public void close() throws JMSException {}
+    public void close() throws JMSException {
+    }
 
     @Override
     public void setComponentFilter(List<String> componentIDs) {
@@ -82,15 +82,13 @@ private Set<MessageListener> getListeners(String destinationId) {
     }
 
     private boolean filterMessage(Message message) {
-        if(!componentFilter.isEmpty()) {
+        if (!componentFilter.isEmpty()) {
             if (message.getTo() != null && !componentFilter.contains(message.getTo())) {
                 return false;
             }
         }
-        if(!collectionFilter.isEmpty()) {
-            if (message.getCollectionID() != null && !collectionFilter.contains(message.getCollectionID())) {
-                return false;
-            }
+        if (!collectionFilter.isEmpty()) {
+            return message.getCollectionID() == null || collectionFilter.contains(message.getCollectionID());
         }
         return true;
     }
diff --git a/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/destination/DefaultReceiverDestinationIDFactory.java b/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/destination/DefaultReceiverDestinationIDFactory.java
index ec2a8bd58..380160870 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/destination/DefaultReceiverDestinationIDFactory.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/destination/DefaultReceiverDestinationIDFactory.java
@@ -5,23 +5,23 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.protocol.messagebus.destination;
 
-public class DefaultReceiverDestinationIDFactory implements ReceiverDestinationIDFactory{
+public class DefaultReceiverDestinationIDFactory implements ReceiverDestinationIDFactory {
     @Override
     public String getReceiverDestinationID(String componentID, String collectionDestinationID) {
         return collectionDestinationID + "-" + componentID;
diff --git a/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/destination/DestinationHelper.java b/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/destination/DestinationHelper.java
index 9bc48fb93..632f5fd08 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/destination/DestinationHelper.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/destination/DestinationHelper.java
@@ -1,25 +1,25 @@
 /*
-* #%L
+ * #%L
  * * Bitmagasin integrationstest
- * 
+ *
  * %%
  * Copyright (C) 2010 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
-*/
+ */
 
 package org.bitrepository.protocol.messagebus.destination;
 
@@ -32,11 +32,12 @@ public class DestinationHelper {
     private ReceiverDestinationIDFactory receiverDestinationIDFactory;
 
     /**
-     * Create a <code>DestinationHelper</code> object with the specified charactaristica
-     * @param componentID The componentID to use for the destination.
+     * Create a <code>DestinationHelper</code> object with the specified characteristics
+     *
+     * @param componentID                       The componentID to use for the destination.
      * @param receiverDestinationIDFactoryClass The class to use for constructing receiverDestinationID.
      *                                          See {@link ReceiverDestinationIDFactory} for possible subclasses.
-     * @param collectionDestinationID The collection ID for the destination
+     * @param collectionDestinationID           The collection ID for the destination
      */
     public DestinationHelper(String componentID, String receiverDestinationIDFactoryClass, String collectionDestinationID) {
         this.componentID = componentID;
diff --git a/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/destination/ReceiverDestinationIDFactory.java b/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/destination/ReceiverDestinationIDFactory.java
index 71857bd92..5095ffd86 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/destination/ReceiverDestinationIDFactory.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/destination/ReceiverDestinationIDFactory.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
diff --git a/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/destination/UserSpecificReceiverDestinationIDFactory.java b/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/destination/UserSpecificReceiverDestinationIDFactory.java
index 1f92752da..94a2651b9 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/destination/UserSpecificReceiverDestinationIDFactory.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/destination/UserSpecificReceiverDestinationIDFactory.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
diff --git a/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/logger/AlarmMessageLogger.java b/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/logger/AlarmMessageLogger.java
index 6fbf65b41..82f355683 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/logger/AlarmMessageLogger.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/logger/AlarmMessageLogger.java
@@ -2,21 +2,21 @@
 
 /*
  * #%L
- * Bitrepository Core
+ * BitRepository Core
  * %%
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -30,11 +30,10 @@
  */
 public class AlarmMessageLogger extends DefaultMessagingLogger {
     @Override
-    protected StringBuilder appendCustomInfo(StringBuilder messageSB, Message message) {
+    protected void appendCustomInfo(StringBuilder messageSB, Message message) {
         if (message instanceof AlarmMessage) {
             AlarmMessage alarmMessage = (AlarmMessage) message;
-            messageSB.append(" Alarm=" + alarmMessage.getAlarm());
+            messageSB.append(" Alarm=").append(alarmMessage.getAlarm());
         }
-        return messageSB;
     }
 }
diff --git a/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/logger/DefaultMessagingLogger.java b/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/logger/DefaultMessagingLogger.java
index e8bb40409..96139207d 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/logger/DefaultMessagingLogger.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/logger/DefaultMessagingLogger.java
@@ -2,21 +2,21 @@
 
 /*
  * #%L
- * Bitrepository Core
+ * BitRepository Core
  * %%
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -42,11 +42,11 @@ public void logMessageSent(Message message) {
             logFullMessage(appendFullRepresentation(messageSB, message).toString());
         } else {
             appendMessageIDString(messageSB, message);
-            messageSB.append(" collectionID " + message.getCollectionID() + ", ");
+            messageSB.append(" collectionID ").append(message.getCollectionID()).append(", ");
             if (message.isSetTo()) {
-                messageSB.append(" to " + message.getTo() + ", ");
+                messageSB.append(" to ").append(message.getTo()).append(", ");
             }
-            messageSB.append(" destination " + message.getDestination() + ": ");
+            messageSB.append(" destination ").append(message.getDestination()).append(": ");
             appendShortRepresentation(messageSB, message);
             logShortMessage(messageSB.toString());
         }
@@ -59,16 +59,16 @@ public void logMessageReceived(Message message) {
             logFullMessage(appendFullRepresentation(messageSB, message).toString());
         } else {
             appendMessageIDString(messageSB, message);
-            messageSB.append(" collectionID " + message.getCollectionID() + ", ");
-            messageSB.append(" from " + message.getFrom() + ": ");
+            messageSB.append(" collectionID ").append(message.getCollectionID()).append(", ");
+            messageSB.append(" from ").append(message.getFrom()).append(": ");
             appendShortRepresentation(messageSB, message);
             logShortMessage(messageSB.toString());
         }
     }
 
     /**
-     *
      * Indicated whether the full message should be logged. Can be overridden in custom loggers.
+     *
      * @param message The message to log
      * @return whether to log the message or not
      */
@@ -78,11 +78,13 @@ protected boolean shouldLogFullMessage(Message message) {
 
     /**
      * Log the full message at trace level. May be overridden to log at a different level for concrete messages.
+     *
      * @param message The message string to log.
      */
     protected void logFullMessage(String message) {
         log.trace(message);
     }
+
     private StringBuilder appendFullRepresentation(StringBuilder messageSB, Message message) {
         messageSB.append(message.toString());
         return messageSB;
@@ -91,34 +93,32 @@ private StringBuilder appendFullRepresentation(StringBuilder messageSB, Message
     /**
      * Log the short version of the message at debug level.
      * May be overridden to log at a different level for concrete messages.
+     *
      * @param message The message string to log.
      */
     protected void logShortMessage(String message) {
         log.debug(message);
     }
-    private StringBuilder appendShortRepresentation(StringBuilder messageSB, Message message) {
+
+    private void appendShortRepresentation(StringBuilder messageSB, Message message) {
         if (message instanceof MessageResponse) {
             appendResponseInfo(messageSB, (MessageResponse) message);
         }
         appendCustomInfo(messageSB, message);
-        return messageSB;
     }
 
-    private StringBuilder appendMessageIDString(StringBuilder messageSB, Message message) {
+    private void appendMessageIDString(StringBuilder messageSB, Message message) {
         messageSB.append(message.getClass().getSimpleName());
-        messageSB.append("(" + MessageUtils.getShortConversationID(message.getCorrelationID()) + ")");
-        return messageSB;
+        messageSB.append("(").append(MessageUtils.getShortConversationID(message.getCorrelationID())).append(")");
     }
 
-    private StringBuilder appendResponseInfo(StringBuilder messageSB, MessageResponse response) {
+    private void appendResponseInfo(StringBuilder messageSB, MessageResponse response) {
         messageSB.append(response.getResponseInfo().getResponseCode());
         if (response.getResponseInfo().getResponseText() != null) {
-            messageSB.append("(" + response.getResponseInfo().getResponseText() + ")");
+            messageSB.append("(").append(response.getResponseInfo().getResponseText()).append(")");
         }
-        return messageSB;
     }
 
-    protected StringBuilder appendCustomInfo(StringBuilder messageSB, Message message) {
-        return messageSB;
+    protected void appendCustomInfo(StringBuilder messageSB, Message message) {
     }
 }
diff --git a/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/logger/DeleteFileMessageLogger.java b/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/logger/DeleteFileMessageLogger.java
index 352f17c59..e61c097b0 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/logger/DeleteFileMessageLogger.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/logger/DeleteFileMessageLogger.java
@@ -7,57 +7,52 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 
-import org.bitrepository.bitrepositorymessages.IdentifyPillarsForDeleteFileRequest;
-import org.bitrepository.bitrepositorymessages.Message;
 import org.bitrepository.bitrepositorymessages.DeleteFileFinalResponse;
 import org.bitrepository.bitrepositorymessages.DeleteFileRequest;
+import org.bitrepository.bitrepositorymessages.IdentifyPillarsForDeleteFileRequest;
+import org.bitrepository.bitrepositorymessages.Message;
 
 /**
  * Custom logger adding DeleteFile message specific parameters.
  */
 public class DeleteFileMessageLogger extends DefaultMessagingLogger {
     @Override
-    protected StringBuilder appendCustomInfo(StringBuilder messageSB, Message message) {
+    protected void appendCustomInfo(StringBuilder messageSB, Message message) {
         if (message instanceof IdentifyPillarsForDeleteFileRequest) {
             IdentifyPillarsForDeleteFileRequest request = (IdentifyPillarsForDeleteFileRequest) message;
-            messageSB.append(" FileID=" + request.getFileID());
-        }
-
-        else if (message instanceof DeleteFileRequest) {
+            messageSB.append(" FileID=").append(request.getFileID());
+        } else if (message instanceof DeleteFileRequest) {
             DeleteFileRequest request = (DeleteFileRequest) message;
-            messageSB.append(" FileID=" + request.getFileID());
+            messageSB.append(" FileID=").append(request.getFileID());
             if (request.getChecksumDataForExistingFile() != null) {
-                messageSB.append(", ChecksumDataForExistingFile=" + request.getChecksumDataForExistingFile());
+                messageSB.append(", ChecksumDataForExistingFile=").append(request.getChecksumDataForExistingFile());
             }
             if (request.getChecksumRequestForExistingFile() != null) {
-                messageSB.append(", ChecksumRequestForExistingFile=" + request.getChecksumRequestForExistingFile());
+                messageSB.append(", ChecksumRequestForExistingFile=").append(request.getChecksumRequestForExistingFile());
             }
             if (request.getAuditTrailInformation() != null) {
-                messageSB.append(", AuditTrailInformation=" + request.getAuditTrailInformation());
+                messageSB.append(", AuditTrailInformation=").append(request.getAuditTrailInformation());
             }
-        }
-
-        else if (message instanceof DeleteFileFinalResponse) {
+        } else if (message instanceof DeleteFileFinalResponse) {
             DeleteFileFinalResponse response = (DeleteFileFinalResponse) message;
             if (response.getChecksumDataForExistingFile() != null) {
-                messageSB.append(", ChecksumDataForExistingFile=" + response.getChecksumDataForExistingFile());
+                messageSB.append(", ChecksumDataForExistingFile=").append(response.getChecksumDataForExistingFile());
             }
         }
-        return messageSB;
     }
 }
diff --git a/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/logger/GetAuditTrailsMessageLogger.java b/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/logger/GetAuditTrailsMessageLogger.java
index a4cd3ad67..97569a750 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/logger/GetAuditTrailsMessageLogger.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/logger/GetAuditTrailsMessageLogger.java
@@ -7,16 +7,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -31,46 +31,43 @@
  */
 public class GetAuditTrailsMessageLogger extends DefaultMessagingLogger {
     @Override
-    protected StringBuilder appendCustomInfo(StringBuilder messageSB, Message message) {
+    protected void appendCustomInfo(StringBuilder messageSB, Message message) {
         if (message instanceof GetAuditTrailsRequest) {
             GetAuditTrailsRequest request = (GetAuditTrailsRequest) message;
             if (request.getResultAddress() != null) {
-                messageSB.append(", FileAddress=" + request.getResultAddress());
+                messageSB.append(", FileAddress=").append(request.getResultAddress());
             }
             if (request.getFileID() != null) {
-                messageSB.append(", FileID=" + request.getFileID());
+                messageSB.append(", FileID=").append(request.getFileID());
             }
             if (request.getMaxNumberOfResults() != null) {
-                messageSB.append(", MaxNumberOfResults=" + request.getMaxNumberOfResults());
+                messageSB.append(", MaxNumberOfResults=").append(request.getMaxNumberOfResults());
             }
             if (request.getMaxSequenceNumber() != null) {
-                messageSB.append(", MaxSequenceNumber=" + request.getMaxSequenceNumber());
+                messageSB.append(", MaxSequenceNumber=").append(request.getMaxSequenceNumber());
             }
             if (request.getMinSequenceNumber() != null) {
-                messageSB.append(", MinSequenceNumber=" + request.getMinSequenceNumber());
+                messageSB.append(", MinSequenceNumber=").append(request.getMinSequenceNumber());
             }
             if (request.getMaxTimestamp() != null) {
-                messageSB.append(", MaxTimestamp=" + request.getMaxTimestamp());
+                messageSB.append(", MaxTimestamp=").append(request.getMaxTimestamp());
             }
             if (request.getMinTimestamp() != null) {
-                messageSB.append(", MinTimestamp=" + request.getMinTimestamp());
+                messageSB.append(", MinTimestamp=").append(request.getMinTimestamp());
             }
             if (request.getAuditTrailInformation() != null) {
-                messageSB.append(", AuditTrailInformation=" + request.getAuditTrailInformation());
+                messageSB.append(", AuditTrailInformation=").append(request.getAuditTrailInformation());
             }
-        }
-
-        else if (message instanceof GetAuditTrailsFinalResponse) {
+        } else if (message instanceof GetAuditTrailsFinalResponse) {
             GetAuditTrailsFinalResponse response = (GetAuditTrailsFinalResponse) message;
 
             if (response.getResultingAuditTrails() != null) {
-                messageSB.append(", NumberOfAuditTrailEvents=" +
-                        response.getResultingAuditTrails().getAuditTrailEvents().getAuditTrailEvent().size());
+                messageSB.append(", NumberOfAuditTrailEvents=")
+                        .append(response.getResultingAuditTrails().getAuditTrailEvents().getAuditTrailEvent().size());
             }
             if (response.isPartialResult() != null) {
-                messageSB.append(", PartialResult=" + response.isPartialResult());
+                messageSB.append(", PartialResult=").append(response.isPartialResult());
             }
         }
-        return messageSB;
     }
 }
diff --git a/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/logger/GetChecksumsMessageLogger.java b/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/logger/GetChecksumsMessageLogger.java
index 6418172cf..0c4e93eba 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/logger/GetChecksumsMessageLogger.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/logger/GetChecksumsMessageLogger.java
@@ -2,21 +2,21 @@
 
 /*
  * #%L
- * Bitrepository Core
+ * BitRepository Core
  * %%
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -33,51 +33,45 @@
  */
 public class GetChecksumsMessageLogger extends DefaultMessagingLogger {
     @Override
-    protected StringBuilder appendCustomInfo(StringBuilder messageSB, Message message) {
+    protected void appendCustomInfo(StringBuilder messageSB, Message message) {
         if (message instanceof IdentifyPillarsForGetChecksumsRequest) {
             IdentifyPillarsForGetChecksumsRequest request = (IdentifyPillarsForGetChecksumsRequest) message;
-            messageSB.append(" FileIDs=" + FileIDsUtils.asString(request.getFileIDs()));
-        }
-
-        else if (message instanceof GetChecksumsRequest) {
+            messageSB.append(" FileIDs=").append(FileIDsUtils.asString(request.getFileIDs()));
+        } else if (message instanceof GetChecksumsRequest) {
             GetChecksumsRequest request = (GetChecksumsRequest) message;
-            messageSB.append(" FileIDs=" + FileIDsUtils.asString(request.getFileIDs()));
+            messageSB.append(" FileIDs=").append(FileIDsUtils.asString(request.getFileIDs()));
             if (request.getChecksumRequestForExistingFile() != null) {
-                messageSB.append(", ChecksumRequestForExistingFile=" + request.getChecksumRequestForExistingFile());
+                messageSB.append(", ChecksumRequestForExistingFile=").append(request.getChecksumRequestForExistingFile());
             }
             if (request.getResultAddress() != null) {
-                messageSB.append(", FileAddress=" + request.getResultAddress());
+                messageSB.append(", FileAddress=").append(request.getResultAddress());
             }
             if (request.getMaxNumberOfResults() != null) {
-                messageSB.append(", MaxNumberOfResults=" + request.getMaxNumberOfResults());
+                messageSB.append(", MaxNumberOfResults=").append(request.getMaxNumberOfResults());
             }
             if (request.getMaxTimestamp() != null) {
-                messageSB.append(", MaxTimestamp=" + request.getMaxTimestamp());
+                messageSB.append(", MaxTimestamp=").append(request.getMaxTimestamp());
             }
             if (request.getMinTimestamp() != null) {
-                messageSB.append(", MinTimestamp=" + request.getMinTimestamp());
+                messageSB.append(", MinTimestamp=").append(request.getMinTimestamp());
             }
             if (request.getAuditTrailInformation() != null) {
-                messageSB.append(", AuditTrailInformation=" + request.getAuditTrailInformation());
+                messageSB.append(", AuditTrailInformation=").append(request.getAuditTrailInformation());
             }
-        }
-
-        else if (message instanceof GetChecksumsFinalResponse) {
+        } else if (message instanceof GetChecksumsFinalResponse) {
             GetChecksumsFinalResponse response = (GetChecksumsFinalResponse) message;
 
             if (response.getResultingChecksums() != null && response.getResultingChecksums().getChecksumDataItems() != null) {
-                messageSB.append(", NumberOfChecksums=" +
-                        response.getResultingChecksums().getChecksumDataItems().size());
+                messageSB.append(", NumberOfChecksums=").append(response.getResultingChecksums().getChecksumDataItems().size());
             }
 
             if (response.getChecksumRequestForExistingFile() != null) {
-                messageSB.append(", ChecksumRequestForExistingFile=" + response.getChecksumRequestForExistingFile());
+                messageSB.append(", ChecksumRequestForExistingFile=").append(response.getChecksumRequestForExistingFile());
             }
 
             if (response.isPartialResult() != null) {
-                messageSB.append(", PartialResult=" + response.isPartialResult());
+                messageSB.append(", PartialResult=").append(response.isPartialResult());
             }
         }
-        return messageSB;
     }
 }
diff --git a/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/logger/GetFileIDsMessageLogger.java b/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/logger/GetFileIDsMessageLogger.java
index 5a7603c39..987a2a0b7 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/logger/GetFileIDsMessageLogger.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/logger/GetFileIDsMessageLogger.java
@@ -2,30 +2,30 @@
 
 /*
  * #%L
- * Bitrepository Core
+ * BitRepository Core
  * %%
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 
-import org.bitrepository.bitrepositorymessages.IdentifyPillarsForGetFileIDsRequest;
-import org.bitrepository.bitrepositorymessages.Message;
 import org.bitrepository.bitrepositorymessages.GetFileIDsFinalResponse;
 import org.bitrepository.bitrepositorymessages.GetFileIDsRequest;
+import org.bitrepository.bitrepositorymessages.IdentifyPillarsForGetFileIDsRequest;
+import org.bitrepository.bitrepositorymessages.Message;
 import org.bitrepository.common.utils.FileIDsUtils;
 
 /**
@@ -33,48 +33,43 @@
  */
 public class GetFileIDsMessageLogger extends DefaultMessagingLogger {
     @Override
-    protected StringBuilder appendCustomInfo(StringBuilder messageSB, Message message) {
+    protected void appendCustomInfo(StringBuilder messageSB, Message message) {
         if (message instanceof IdentifyPillarsForGetFileIDsRequest) {
             IdentifyPillarsForGetFileIDsRequest request = (IdentifyPillarsForGetFileIDsRequest) message;
             if (request.getFileIDs() != null) {
-                messageSB.append(" FileIDs=" + FileIDsUtils.asString(request.getFileIDs()));
+                messageSB.append(" FileIDs=").append(FileIDsUtils.asString(request.getFileIDs()));
             }
-        }
-
-        else if (message instanceof GetFileIDsRequest) {
+        } else if (message instanceof GetFileIDsRequest) {
             GetFileIDsRequest request = (GetFileIDsRequest) message;
             if (request.getFileIDs() != null) {
-                messageSB.append(" FileIDs=" + FileIDsUtils.asString(request.getFileIDs()));
+                messageSB.append(" FileIDs=").append(FileIDsUtils.asString(request.getFileIDs()));
             }
             if (request.getResultAddress() != null) {
-                messageSB.append(", FileAddress=" + request.getResultAddress());
+                messageSB.append(", FileAddress=").append(request.getResultAddress());
             }
             if (request.getMaxNumberOfResults() != null) {
-                messageSB.append(", MaxNumberOfResults=" + request.getMaxNumberOfResults());
+                messageSB.append(", MaxNumberOfResults=").append(request.getMaxNumberOfResults());
             }
             if (request.getMaxTimestamp() != null) {
-                messageSB.append(", MaxTimestamp=" + request.getMaxTimestamp());
+                messageSB.append(", MaxTimestamp=").append(request.getMaxTimestamp());
             }
             if (request.getMinTimestamp() != null) {
-                messageSB.append(", MinTimestamp=" + request.getMinTimestamp());
+                messageSB.append(", MinTimestamp=").append(request.getMinTimestamp());
             }
             if (request.getAuditTrailInformation() != null) {
-                messageSB.append(", AuditTrailInformation=" + request.getAuditTrailInformation());
+                messageSB.append(", AuditTrailInformation=").append(request.getAuditTrailInformation());
             }
-        }
-
-        else if (message instanceof GetFileIDsFinalResponse) {
+        } else if (message instanceof GetFileIDsFinalResponse) {
             GetFileIDsFinalResponse response = (GetFileIDsFinalResponse) message;
 
             if (response.getResultingFileIDs() != null && response.getResultingFileIDs().getFileIDsData() != null) {
-                messageSB.append(", NumberOfFileIDs=" +
-                        response.getResultingFileIDs().getFileIDsData().getFileIDsDataItems().getFileIDsDataItem().size());
+                messageSB.append(", NumberOfFileIDs=")
+                        .append(response.getResultingFileIDs().getFileIDsData().getFileIDsDataItems().getFileIDsDataItem().size());
             }
 
             if (response.isPartialResult() != null) {
-                messageSB.append(", PartialResult=" + response.isPartialResult());
+                messageSB.append(", PartialResult=").append(response.isPartialResult());
             }
         }
-        return messageSB;
     }
 }
diff --git a/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/logger/GetFileMessageLogger.java b/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/logger/GetFileMessageLogger.java
index 52a5dedca..9f3039c10 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/logger/GetFileMessageLogger.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/logger/GetFileMessageLogger.java
@@ -2,21 +2,21 @@
 
 /*
  * #%L
- * Bitrepository Core
+ * BitRepository Core
  * %%
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -31,20 +31,17 @@
  */
 public class GetFileMessageLogger extends DefaultMessagingLogger {
     @Override
-    protected StringBuilder appendCustomInfo(StringBuilder messageSB, Message message) {
+    protected void appendCustomInfo(StringBuilder messageSB, Message message) {
         if (message instanceof IdentifyPillarsForGetFileRequest) {
             IdentifyPillarsForGetFileRequest request = (IdentifyPillarsForGetFileRequest) message;
-            messageSB.append(" FileID=" + request.getFileID());
-        }
-
-        else if (message instanceof GetFileRequest) {
+            messageSB.append(" FileID=").append(request.getFileID());
+        } else if (message instanceof GetFileRequest) {
             GetFileRequest getFileRequest = (GetFileRequest) message;
-            messageSB.append(" FileID=" + getFileRequest.getFileID());
+            messageSB.append(" FileID=").append(getFileRequest.getFileID());
             if (getFileRequest.getFilePart() != null) {
-                messageSB.append(", FilePart=" + getFileRequest.getFilePart());
+                messageSB.append(", FilePart=").append(getFileRequest.getFilePart());
             }
-            messageSB.append(", FileAddress=" + getFileRequest.getFileAddress());
+            messageSB.append(", FileAddress=").append(getFileRequest.getFileAddress());
         }
-        return messageSB;
     }
 }
diff --git a/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/logger/GetStatusMessageLogger.java b/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/logger/GetStatusMessageLogger.java
index 460526366..248c9d602 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/logger/GetStatusMessageLogger.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/logger/GetStatusMessageLogger.java
@@ -2,21 +2,21 @@
 
 /*
  * #%L
- * Bitrepository Core
+ * BitRepository Core
  * %%
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -25,7 +25,7 @@
 import org.bitrepository.bitrepositorymessages.Message;
 
 /**
- * Custom logger for the status messages. Will only log mesages on trace level.
+ * Custom logger for the status messages. Will only log messages on trace level.
  */
 public class GetStatusMessageLogger extends DefaultMessagingLogger {
     @Override
@@ -36,6 +36,7 @@ protected boolean shouldLogFullMessage(Message message) {
     /**
      * To avoid spawning the log with the GetStatus message 'heartbeats', the message are only
      * logged at trace level.
+     *
      * @param message The message string to log.
      */
     @Override
diff --git a/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/logger/MessageLogger.java b/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/logger/MessageLogger.java
index fce625f19..f1b9e75c0 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/logger/MessageLogger.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/logger/MessageLogger.java
@@ -2,21 +2,21 @@
 
 /*
  * #%L
- * Bitrepository Core
+ * BitRepository Core
  * %%
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -26,13 +26,17 @@
 
 public interface MessageLogger {
 
-    /** Creates a message received log for the specific message
+    /**
+     * Creates a message received log for the specific message
+     *
      * @param message the specific message
-     * */
+     */
     void logMessageSent(Message message);
 
-    /** Creates a message received log for the specific message
+    /**
+     * Creates a message received log for the specific message
+     *
      * @param message the specific message
-     * */
+     */
     void logMessageReceived(Message message);
 }
diff --git a/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/logger/MessageLoggerProvider.java b/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/logger/MessageLoggerProvider.java
index dda7dedd3..86f8303a3 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/logger/MessageLoggerProvider.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/logger/MessageLoggerProvider.java
@@ -2,38 +2,38 @@
 
 /*
  * #%L
- * Bitrepository Core
+ * BitRepository Core
  * %%
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 
+import org.bitrepository.bitrepositorymessages.Message;
+import org.bitrepository.protocol.OperationType;
+
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.bitrepository.bitrepositorymessages.Message;
-import org.bitrepository.protocol.OperationType;
-
 /**
  * Defines how messages received or sent are logged. Meant to be used in the shared message bus
  * instances.
- *
+ * <p>
  * Custom logs can be defined for individual classes, which can be added through the
  * addMessageLogger method with a specific logger class for the operation.
  */
@@ -43,7 +43,8 @@ public class MessageLoggerProvider implements MessageLogger {
     private final Map<String, MessageLogger> messageToLoggerMap = new HashMap<>();
     private final MessageLogger defaultLogger = new DefaultMessagingLogger();
 
-    private MessageLoggerProvider() {}
+    private MessageLoggerProvider() {
+    }
 
     public static MessageLoggerProvider getInstance() {
         return instance;
@@ -58,30 +59,26 @@ public void logMessageReceived(Message message) {
     }
 
     public void registerLogger(Collection<String> messageSimpleNames, MessageLogger customLogger) {
-        for (String messageName:messageSimpleNames) {
+        for (String messageName : messageSimpleNames) {
             messageToLoggerMap.put(messageName, customLogger);
         }
     }
 
     public void registerLogger(OperationType operation, MessageLogger customLogger) {
         Collection<String> messageSimpleNames = Arrays.asList(
-            "IdentifyContributorsFor" + operation.value() + "Request",
-            "IdentifyPillarsFor" + operation.value() + "Request",
-            "IdentifyContributorsFor" + operation.value() + "Response",
-            "IdentifyPillarsFor" + operation.value() + "Response",
-            operation.value() + "Request",
-            operation.value() + "ProgressResponse",
-            operation.value() + "FinalResponse"
+                "IdentifyContributorsFor" + operation.value() + "Request",
+                "IdentifyPillarsFor" + operation.value() + "Request",
+                "IdentifyContributorsFor" + operation.value() + "Response",
+                "IdentifyPillarsFor" + operation.value() + "Response",
+                operation.value() + "Request",
+                operation.value() + "ProgressResponse",
+                operation.value() + "FinalResponse"
         );
         registerLogger(messageSimpleNames, customLogger);
     }
 
     private MessageLogger lookupLogger(Message message) {
         String messageName = message.getClass().getSimpleName();
-        if (messageToLoggerMap.containsKey(messageName)) {
-            return messageToLoggerMap.get(messageName);
-        } else {
-            return defaultLogger;
-        }
+        return messageToLoggerMap.getOrDefault(messageName, defaultLogger);
     }
 }
diff --git a/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/logger/PutFileMessageLogger.java b/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/logger/PutFileMessageLogger.java
index b8a521a5e..5917d1d77 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/logger/PutFileMessageLogger.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/logger/PutFileMessageLogger.java
@@ -7,16 +7,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -33,39 +33,34 @@
  */
 public class PutFileMessageLogger extends DefaultMessagingLogger {
     @Override
-    protected StringBuilder appendCustomInfo(StringBuilder messageSB, Message message) {
+    protected void appendCustomInfo(StringBuilder messageSB, Message message) {
         if (message instanceof IdentifyPillarsForPutFileRequest) {
             IdentifyPillarsForPutFileRequest request = (IdentifyPillarsForPutFileRequest) message;
-            messageSB.append(" FileID=" + request.getFileID());
+            messageSB.append(" FileID=").append(request.getFileID());
         } else if (message instanceof IdentifyPillarsForPutFileResponse) {
             IdentifyPillarsForPutFileResponse response = (IdentifyPillarsForPutFileResponse) message;
-            messageSB.append(" ChecksumDataForExistingFileID=" + response.getChecksumDataForExistingFile());
-        }
-
-        else if (message instanceof PutFileRequest) {
+            messageSB.append(" ChecksumDataForExistingFileID=").append(response.getChecksumDataForExistingFile());
+        } else if (message instanceof PutFileRequest) {
             PutFileRequest request = (PutFileRequest) message;
-            messageSB.append(" FileID=" + request.getFileID());
-            messageSB.append(", FileAddress=" + request.getFileAddress());
+            messageSB.append(" FileID=").append(request.getFileID());
+            messageSB.append(", FileAddress=").append(request.getFileAddress());
             if (request.getChecksumDataForNewFile() != null) {
-                messageSB.append(", ChecksumDataForNewFile=" + request.getChecksumDataForNewFile());
+                messageSB.append(", ChecksumDataForNewFile=").append(request.getChecksumDataForNewFile());
             }
             if (request.getChecksumRequestForNewFile() != null) {
-                messageSB.append(", ChecksumRequestForNewFile=" + request.getChecksumRequestForNewFile());
+                messageSB.append(", ChecksumRequestForNewFile=").append(request.getChecksumRequestForNewFile());
             }
             if (request.getFileSize() != null) {
-                messageSB.append(", FileSize=" + request.getFileSize());
+                messageSB.append(", FileSize=").append(request.getFileSize());
             }
             if (request.getAuditTrailInformation() != null) {
-                messageSB.append(", AuditTrailInformation=" + request.getAuditTrailInformation());
+                messageSB.append(", AuditTrailInformation=").append(request.getAuditTrailInformation());
             }
-        }
-
-        else if (message instanceof PutFileFinalResponse) {
+        } else if (message instanceof PutFileFinalResponse) {
             PutFileFinalResponse response = (PutFileFinalResponse) message;
             if (response.getChecksumDataForNewFile() != null) {
-                messageSB.append(", ChecksumDataForNewFile=" + response.getChecksumDataForNewFile());
+                messageSB.append(", ChecksumDataForNewFile=").append(response.getChecksumDataForNewFile());
             }
         }
-        return messageSB;
     }
 }
diff --git a/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/logger/ReplaceFileMessageLogger.java b/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/logger/ReplaceFileMessageLogger.java
deleted file mode 100644
index dad1ab267..000000000
--- a/bitrepository-core/src/main/java/org/bitrepository/protocol/messagebus/logger/ReplaceFileMessageLogger.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package org.bitrepository.protocol.messagebus.logger;
-
-/*
- * #%L
- * Bitrepository Core
- * %%
- * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
- * License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
- * License along with this program.  If not, see
- * <http://www.gnu.org/licenses/lgpl-2.1.html>.
- * #L%
- */
-
-import org.bitrepository.bitrepositorymessages.IdentifyPillarsForReplaceFileRequest;
-import org.bitrepository.bitrepositorymessages.Message;
-import org.bitrepository.bitrepositorymessages.ReplaceFileFinalResponse;
-import org.bitrepository.bitrepositorymessages.ReplaceFileRequest;
-
-/**
- * Custom logger adding ReplaceFile message specific parameters.
- */
-public class ReplaceFileMessageLogger extends DefaultMessagingLogger {
-    @Override
-    protected StringBuilder appendCustomInfo(StringBuilder messageSB, Message message) {
-        if (message instanceof IdentifyPillarsForReplaceFileRequest) {
-            IdentifyPillarsForReplaceFileRequest request = (IdentifyPillarsForReplaceFileRequest) message;
-            messageSB.append(" FileID=" + request.getFileID());
-        }
-
-        else if (message instanceof ReplaceFileRequest) {
-            ReplaceFileRequest request = (ReplaceFileRequest) message;
-            messageSB.append(" FileID=" + request.getFileID());
-            messageSB.append(", FileAddress=" + request.getFileAddress());
-            if (request.getChecksumDataForNewFile() != null) {
-                messageSB.append(", ChecksumDataForNewFile=" + request.getChecksumDataForNewFile());
-            }
-            if (request.getChecksumRequestForNewFile() != null) {
-                messageSB.append(", ChecksumRequestForNewFile=" + request.getChecksumRequestForNewFile());
-            }
-            if (request.getChecksumDataForExistingFile() != null) {
-                messageSB.append(", ChecksumDataForExistingFile=" + request.getChecksumDataForExistingFile());
-            }
-            if (request.getChecksumRequestForExistingFile() != null) {
-                messageSB.append(", ChecksumRequestForExistingFile=" + request.getChecksumRequestForExistingFile());
-            }
-            if (request.getFileSize() != null) {
-                messageSB.append(", FileSize=" + request.getFileSize());
-            }
-            if (request.getAuditTrailInformation() != null) {
-                messageSB.append(", AuditTrailInformation=" + request.getAuditTrailInformation());
-            }
-        }
-
-        else if (message instanceof ReplaceFileFinalResponse) {
-            ReplaceFileFinalResponse response = (ReplaceFileFinalResponse) message;
-            if (response.getChecksumDataForExistingFile() != null) {
-                messageSB.append(", ChecksumDataForExistingFile=" + response.getChecksumDataForExistingFile());
-            }
-            if (response.getChecksumDataForNewFile() != null) {
-                messageSB.append(", ChecksumDataForNewFile=" + response.getChecksumDataForNewFile());
-            }
-        }
-        return messageSB;
-    }
-}
diff --git a/bitrepository-core/src/main/java/org/bitrepository/protocol/security/BasicMessageAuthenticator.java b/bitrepository-core/src/main/java/org/bitrepository/protocol/security/BasicMessageAuthenticator.java
index 257d2c0c9..21c229f37 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/protocol/security/BasicMessageAuthenticator.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/protocol/security/BasicMessageAuthenticator.java
@@ -5,24 +5,22 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.protocol.security;
 
-import java.security.cert.X509Certificate;
-
 import org.bitrepository.protocol.security.exception.MessageAuthenticationException;
 import org.bitrepository.protocol.security.exception.PermissionStoreException;
 import org.bitrepository.protocol.security.exception.SecurityException;
@@ -35,16 +33,18 @@
 import org.bouncycastle.cms.jcajce.JcaSimpleSignerInfoVerifierBuilder;
 import org.bouncycastle.operator.OperatorCreationException;
 
+import java.security.cert.X509Certificate;
+
 /**
- * Class to handle authentication of messages.  
+ * Class to handle authentication of messages.
  */
 public class BasicMessageAuthenticator implements MessageAuthenticator {
 
     /**
-     * Non-infrastructure certificates and permission store  
+     * Non-infrastructure certificates and permission store
      */
     private final PermissionStore permissionStore;
-    
+
     /**
      * @param permissionStore the permissionStore holding the known certificates
      */
@@ -60,12 +60,12 @@ public SignerId authenticateMessage(byte[] messageData, byte[] signatureData) th
             X509Certificate signingCert = permissionStore.getCertificate(signer.getSID());
             SignerInformationVerifier verifier = new JcaSimpleSignerInfoVerifierBuilder().setProvider(
                     SecurityModuleConstants.BC).build(signingCert);
-            
-            if(!signer.verify(verifier)) {
+
+            if (!signer.verify(verifier)) {
                 throw new MessageAuthenticationException("Signature does not match the message. Indicated " +
-                    "certificate did not sign message. Certificate issuer: " 
-                        + signingCert.getIssuerX500Principal().getName() + ", serial: " 
-                    + signingCert.getSerialNumber());  
+                        "certificate did not sign message. Certificate issuer: "
+                        + signingCert.getIssuerX500Principal().getName() + ", serial: "
+                        + signingCert.getSerialNumber());
             }
             return signer.getSID();
         } catch (PermissionStoreException e) {
diff --git a/bitrepository-core/src/main/java/org/bitrepository/protocol/security/BasicMessageSigner.java b/bitrepository-core/src/main/java/org/bitrepository/protocol/security/BasicMessageSigner.java
index 991bb8afc..237da34f5 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/protocol/security/BasicMessageSigner.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/protocol/security/BasicMessageSigner.java
@@ -5,25 +5,22 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.protocol.security;
 
-import java.security.KeyStore.PrivateKeyEntry;
-import java.security.cert.X509Certificate;
-
 import org.bitrepository.protocol.security.exception.MessageSigningException;
 import org.bouncycastle.cms.CMSProcessableByteArray;
 import org.bouncycastle.cms.CMSSignedData;
@@ -34,32 +31,31 @@
 import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
 import org.bouncycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder;
 
+import java.security.KeyStore.PrivateKeyEntry;
+import java.security.cert.X509Certificate;
+
 /**
  * Handles signing of messages.
  */
 public class BasicMessageSigner implements MessageSigner {
-
-    /** Constant to indicate whether to used attached or detached mode for signing.*/
     private static final boolean USE_ATTACHED_MODE = false;
-    /** Container for the private key and certificate needed to sign messages*/
     private PrivateKeyEntry privateKeyEntry;
-    /** SignerInfoBuilder used in the signing process. */
     private JcaSignerInfoGeneratorBuilder builder;
-    /** Content signer used to sign messages */
     private ContentSigner sha512Signer;
-    
+
     /**
      * Sets the privateKeyEntry member and initializes the objects that's needed for signing messages.
-     * @param privateKeyEntry the PrivatKeyEntry holding the private key and certificate needed for creating a signature.
+     *
+     * @param privateKeyEntry the PrivateKeyEntry holding the private key and certificate needed for creating a signature.
      */
     public void setPrivateKeyEntry(PrivateKeyEntry privateKeyEntry) {
-        if(privateKeyEntry == null) {
+        if (privateKeyEntry == null) {
             return;
         }
         this.privateKeyEntry = privateKeyEntry;
         try {
-            sha512Signer = new JcaContentSignerBuilder(SecurityModuleConstants.SignatureType)
-                    .setProvider(SecurityModuleConstants.BC).build(privateKeyEntry.getPrivateKey());
+            sha512Signer = new JcaContentSignerBuilder(SecurityModuleConstants.SignatureType).setProvider(SecurityModuleConstants.BC)
+                    .build(privateKeyEntry.getPrivateKey());
             builder = new JcaSignerInfoGeneratorBuilder(
                     new JcaDigestCalculatorProviderBuilder().setProvider(SecurityModuleConstants.BC).build());
             builder.setDirectSignature(true);
@@ -67,21 +63,22 @@ public void setPrivateKeyEntry(PrivateKeyEntry privateKeyEntry) {
             throw new RuntimeException(e.getMessage(), e);
         }
     }
-    
+
     /**
-     * Creates the CMS signature for a message. 
+     * Creates the CMS signature for a message.
+     *
      * @param messageData the message data that is to be signed.
-     * @return the CMS signature for the message. 
-     * @throws MessageSigningException in case signing fails. 
+     * @return the CMS signature for the message.
+     * @throws MessageSigningException in case signing fails.
      */
     @Override
     public byte[] signMessage(byte[] messageData) throws MessageSigningException {
-        if(privateKeyEntry == null) {
+        if (privateKeyEntry == null) {
             throw new MessageSigningException("Private key entry has not been initialized.", null);
         }
         try {
             CMSSignedDataGenerator gen = new CMSSignedDataGenerator();
-            gen.addSignerInfoGenerator(builder.build(sha512Signer, (X509Certificate)privateKeyEntry.getCertificate()));
+            gen.addSignerInfoGenerator(builder.build(sha512Signer, (X509Certificate) privateKeyEntry.getCertificate()));
             CMSSignedData signedData = gen.generate(new CMSProcessableByteArray(messageData), USE_ATTACHED_MODE);
 
             return signedData.getEncoded();
diff --git a/bitrepository-core/src/main/java/org/bitrepository/protocol/security/BasicOperationAuthorizer.java b/bitrepository-core/src/main/java/org/bitrepository/protocol/security/BasicOperationAuthorizer.java
index 4c538a2e8..9681414cd 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/protocol/security/BasicOperationAuthorizer.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/protocol/security/BasicOperationAuthorizer.java
@@ -5,23 +5,22 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.protocol.security;
 
-import java.util.List;
 import org.bitrepository.protocol.security.exception.CertificateUseException;
 import org.bitrepository.protocol.security.exception.OperationAuthorizationException;
 import org.bitrepository.protocol.security.exception.PermissionStoreException;
@@ -29,16 +28,15 @@
 import org.bitrepository.settings.repositorysettings.Operation;
 import org.bouncycastle.cms.SignerId;
 
+import java.util.List;
+
 /**
- * Class to check permissions based on the signer of a MessageRequest and the type of request. 
+ * Class to check permissions based on the signer of a MessageRequest and the type of request.
  */
 public class BasicOperationAuthorizer implements OperationAuthorizer {
-
-    /** Mapper from operation type to needed permission */
-    private RequestToOperationPermissionMapper requestToPermissionMapper;
-    /** Non-infrastructure certificates and permission store */
+    private final RequestToOperationPermissionMapper requestToPermissionMapper;
     private final PermissionStore permissionStore;
-    
+
     /**
      * @param permissionStore permissionStore which holds the permissions to check against.
      */
@@ -46,50 +44,49 @@ public BasicOperationAuthorizer(PermissionStore permissionStore) {
         requestToPermissionMapper = new RequestToOperationPermissionMapper();
         this.permissionStore = permissionStore;
     }
-    
+
     /**
      * Method to determine whether a given componentID is allowed to sign a message with the given certificate.
+     *
      * @param certificateUser the componentID of the component that signed the message
-     * @param signer the signerId of the certificate that signed the message
-     * @throws CertificateUseException in case the message has been signed by the wrong user. 
-     * 
+     * @param signer          the signerId of the certificate that signed the message
+     * @throws CertificateUseException in case the message has been signed by the wrong user.
      */
     public void authorizeCertificateUse(String certificateUser, SignerId signer) throws CertificateUseException {
         try {
-            if(permissionStore.checkCertificateUser(signer, certificateUser)) {
-                return ;
+            if (permissionStore.checkCertificateUser(signer, certificateUser)) {
+                return;
             }
         } catch (PermissionStoreException e) {
             throw new CertificateUseException(e.getMessage(), e);
         }
-        throw new CertificateUseException("The user '" + certificateUser + "' does not have registered the needed " +
-        		"rights for being the signer: " + signer.toString());
+        throw new CertificateUseException(
+                "The user '" + certificateUser + "' does not have registered the needed " + "rights for being the signer: " + signer);
     }
-    
+
     /**
      * Method to determine whether an operation is allowed
+     *
      * @param operationType the type of operation to authorize
-     * @param signer the signerId of the certificate used to create the signature belonging to the request 
-     * which is to be authorized.  
-     * @param collectionID The ID to authorize the operation for.
+     * @param signer        the signerId of the certificate used to create the signature belonging to the request
+     *                      which is to be authorized.
+     * @param collectionID  The ID to authorize the operation for.
      * @throws OperationAuthorizationException if authorization fails
-     * @throws UnregisteredPermissionException 
      */
     @Override
-    public void authorizeOperation(String operationType, SignerId signer, String collectionID) 
+    public void authorizeOperation(String operationType, SignerId signer, String collectionID)
             throws OperationAuthorizationException, UnregisteredPermissionException {
         List<Operation> permissions = requestToPermissionMapper.getRequiredPermissions(operationType);
-        for(Operation permission : permissions) {
+        for (Operation permission : permissions) {
             try {
-                if(permissionStore.checkPermission(signer, permission, collectionID)) {
-                    return ;
+                if (permissionStore.checkPermission(signer, permission, collectionID)) {
+                    return;
                 }
             } catch (PermissionStoreException e) {
                 throw new OperationAuthorizationException(e.getMessage(), e);
             }
         }
-        throw new OperationAuthorizationException("The required permission has not been registered for the signer: " + 
-                signer.toString());
+        throw new OperationAuthorizationException("The required permission has not been registered for the signer: " + signer.toString());
     }
 
 }
diff --git a/bitrepository-core/src/main/java/org/bitrepository/protocol/security/BasicSecurityManager.java b/bitrepository-core/src/main/java/org/bitrepository/protocol/security/BasicSecurityManager.java
index c270b6a20..4f25bcef8 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/protocol/security/BasicSecurityManager.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/protocol/security/BasicSecurityManager.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -77,49 +77,76 @@
  * - loading of certificates
  * - setup of SSLContext
  * - Authentication of signatures
- * - Signature generation 
+ * - Signature generation
  * - Authorization of operations
  */
 public class BasicSecurityManager implements SecurityManager {
-	/** Key to environment variable for default truststore */
-	private static final String DEFAULT_TRUSTSTORE_PARAM="javax.net.ssl.trustStore";
-	/** Key to environment variable for default truststore password */
-	private static final String DEFAULT_TRUSTSTORE_PASS_PARAM="javax.net.ssl.trustStorePassword";
-	
+    /**
+     * Key to environment variable for default truststore
+     */
+    private static final String DEFAULT_TRUSTSTORE_PARAM = "javax.net.ssl.trustStore";
+    /**
+     * Key to environment variable for default truststore password
+     */
+    private static final String DEFAULT_TRUSTSTORE_PASS_PARAM = "javax.net.ssl.trustStorePassword";
+
     private final Logger log = LoggerFactory.getLogger(BasicSecurityManager.class);
-    /** Default password for the in-memory keystore */
+    /**
+     * Default password for the in-memory keystore
+     */
     private static final String defaultPassword = "123456";
-    /** path to file containing the components private key and certificate */
+    /**
+     * path to file containing the components private key and certificate
+     */
     private final String privateKeyFile;
-    /** RepositorySettings */
+    /**
+     * RepositorySettings
+     */
     private final RepositorySettings repositorySettings;
-    /** Object to authenticate messages */
+    /**
+     * Object to authenticate messages
+     */
     private final MessageAuthenticator authenticator;
-    /** Object to sign messages */
+    /**
+     * Object to sign messages
+     */
     private final MessageSigner signer;
-    /** Object to authorize operations */
+    /**
+     * Object to authorize operations
+     */
     private final OperationAuthorizer authorizer;
-    /** Object storing permissions and certificates */
+    /**
+     * Object storing permissions and certificates
+     */
     private final PermissionStore permissionStore;
-    /** int value to keep track of the next keystore alias */
+    /**
+     * int value to keep track of the next keystore alias
+     */
     private static int aliasID = 0;
-    /** In memory keyStore */
-    private KeyStore keyStore; 
-    /** Member for holding the PrivateKeyEntry containing the from privateKeyFile loaded key and certificate */
+    /**
+     * In memory keyStore
+     */
+    private KeyStore keyStore;
+    /**
+     * Member for holding the PrivateKeyEntry containing the privateKeyFile loaded key and certificate
+     */
     private PrivateKeyEntry privateKeyEntry;
-    /** The ID of the component where this instance of the BasicSecurityManager is running */
+    /**
+     * The ID of the component where this instance of the BasicSecurityManager is running
+     */
     private final String componentID;
-    
+
     /**
      * Constructor for the SecurityManager.
+     *
      * @param repositorySettings the collection settings to retrieve settings from
-     * @param privateKeyFile path to the file containing the components private key and certificate, may be null if not using
-     *        certificates and encryption.
-     * @param authenticator MessageAuthenticator for authenticating messages
-     * @param signer MessageSigner for signing messages.
-     * @param authorizer OperationAuthorizer to authorize operations
-     * @param permissionStore the PermissionStore to hold certificates and adjoining permissions
-     * @param componentID the component ID
+     * @param privateKeyFile     path to the file containing the components private key and certificate, may be null if not using
+     *                           certificates and encryption.
+     * @param authenticator      MessageAuthenticator for authenticating messages
+     * @param signer             MessageSigner for signing messages.
+     * @param authorizer         OperationAuthorizer to authorize operations
+     * @param permissionStore    the PermissionStore to hold certificates and adjoining permissions
+     * @param componentID        the component ID
      */
     public BasicSecurityManager(RepositorySettings repositorySettings, String privateKeyFile, MessageAuthenticator authenticator,
                                 MessageSigner signer, OperationAuthorizer authorizer, PermissionStore permissionStore, String componentID) {
@@ -137,71 +164,73 @@ public BasicSecurityManager(RepositorySettings repositorySettings, String privat
         this.componentID = componentID;
         initialize();
     }
-    
+
     @Override
     public SignerId authenticateMessage(String message, String signature) throws MessageAuthenticationException {
-        if(repositorySettings.getProtocolSettings().isRequireMessageAuthentication()) {
+        if (repositorySettings.getProtocolSettings().isRequireMessageAuthentication()) {
             if (signature != null) {
-            try {
-                byte[] decodedSig = Base64.decode(signature.getBytes(SecurityModuleConstants.defaultEncodingType));
-                byte[] decodeMessage = message.getBytes(SecurityModuleConstants.defaultEncodingType);
-                return authenticator.authenticateMessage(decodeMessage, decodedSig);
-            } catch (UnsupportedEncodingException e) {
-                throw new SecurityException(SecurityModuleConstants.defaultEncodingType + " encoding not supported", e);
-            }
+                try {
+                    byte[] decodedSig = Base64.decode(signature.getBytes(SecurityModuleConstants.defaultEncodingType));
+                    byte[] decodeMessage = message.getBytes(SecurityModuleConstants.defaultEncodingType);
+                    return authenticator.authenticateMessage(decodeMessage, decodedSig);
+                } catch (UnsupportedEncodingException e) {
+                    throw new SecurityException(SecurityModuleConstants.defaultEncodingType + " encoding not supported", e);
+                }
             } else {
                 throw new MessageAuthenticationException("Received unsigned message, but authentication is required");
             }
         }
         return null;
     }
-    
+
     /**
      * Method to sign a message
+     *
      * @param message the message to sign
      * @return the signature for the message, or null if authentication is disabled.
-     * @throws MessageSigningException if signing of the message fails.   
+     * @throws MessageSigningException if signing of the message fails.
      */
     public String signMessage(String message) throws MessageSigningException {
-        if(repositorySettings.getProtocolSettings().isRequireMessageAuthentication()) {
+        if (repositorySettings.getProtocolSettings().isRequireMessageAuthentication()) {
             try {
                 byte[] signature = signer.signMessage(message.getBytes(SecurityModuleConstants.defaultEncodingType));
                 return new String(Base64.encode(signature), StandardCharsets.UTF_8);
             } catch (UnsupportedEncodingException e) {
                 throw new SecurityException(SecurityModuleConstants.defaultEncodingType + " encoding not supported", e);
-            }           
-        } else { 
+            }
+        } else {
             return null;
         }
     }
-    
-    /** 
+
+    /**
      * Method to authorize the use of a certificate
+     *
      * @param certificateUser the user who signed the message
-     * @param messageData the data of the message request.
-     * @param signature the signature belonging to the message request.
-     * @throws CertificateUseException in case the certificate use could not be authorized. 
+     * @param messageData     the data of the message request.
+     * @param signature       the signature belonging to the message request.
+     * @throws CertificateUseException in case the certificate use could not be authorized.
      */
-    public void authorizeCertificateUse(String certificateUser, String messageData, String signature) 
-            throws CertificateUseException {
-        if(repositorySettings.getProtocolSettings().isRequireOperationAuthorization()) {
+    public void authorizeCertificateUse(String certificateUser, String messageData, String signature) throws CertificateUseException {
+        if (repositorySettings.getProtocolSettings().isRequireOperationAuthorization()) {
             CMSSignedData s = makeSignedData(messageData, signature);
 
             SignerInformation signer = s.getSignerInfos().getSigners().iterator().next();
-            authorizer.authorizeCertificateUse(certificateUser, signer.getSID());    
+            authorizer.authorizeCertificateUse(certificateUser, signer.getSID());
         }
     }
 
     /**
      * Method to authorize an operation
+     *
      * @param operationType the type of operation that is to be authorized.
-     * @param messageData the data of the message request.
-     * @param signature the signature belonging to the message request.
+     * @param messageData   the data of the message request.
+     * @param signature     the signature belonging to the message request.
      * @throws OperationAuthorizationException in case of failure.
      */
     public void authorizeOperation(String operationType, String messageData, String signature, String collectionID)
             throws OperationAuthorizationException {
-        if(repositorySettings.getProtocolSettings().isRequireOperationAuthorization()) {
+        if (repositorySettings.getProtocolSettings().isRequireOperationAuthorization()) {
             CMSSignedData s = makeSignedData(messageData, signature);
 
             SignerInformation signer = s.getSignerInfos().getSigners().iterator().next();
@@ -215,8 +244,9 @@ public void authorizeOperation(String operationType, String messageData, String
 
     /**
      * Encapsulates the data of a message request and a signature into a CMSSignedData object.
+     *
      * @param messageData the data of a message request.
-     * @param signature the signature belonging to the message request.
+     * @param signature   the signature belonging to the message request.
      * @return the signed data.
      */
     private CMSSignedData makeSignedData(String messageData, String signature) {
@@ -253,15 +283,16 @@ private void initialize() {
             setupDefaultSSLContext();
         } catch (Exception e) {
             throw new SecurityException(e.getMessage(), e);
-        } 
+        }
     }
-    
+
     /**
      * Obtain the keystore in which to place certificates loaded by the bitrepository.
      * Attempt to load trusted certificates from a truststore specified by environment variables.
      * If a truststore is specified by environment variables, the returned KeyStore will have its trusted
-     * certificates loaded. Otherwise the returned keystore will be empty.
+     * certificates loaded. Otherwise, the returned keystore will be empty.
      * This is in order to not throw out default trust store.
+     *
      * @return KeyStore, conditionally containing trusted certificates from the external truststore.
      */
     private KeyStore getKeyStore() throws KeyStoreException, NoSuchAlgorithmException, CertificateException, IOException {
@@ -269,9 +300,9 @@ private KeyStore getKeyStore() throws KeyStoreException, NoSuchAlgorithmExceptio
         store.load(null);
 
         KeyStore systemTrustStore = loadSystemTrustStore();
-        if(systemTrustStore != null) {
+        if (systemTrustStore != null) {
             Enumeration<String> systemAliases = systemTrustStore.aliases();
-            while(systemAliases.hasMoreElements()) {
+            while (systemAliases.hasMoreElements()) {
                 String alias = systemAliases.nextElement();
                 Certificate certificate = systemTrustStore.getCertificate(alias);
                 store.setEntry(getNewAlias(), new KeyStore.TrustedCertificateEntry(certificate),
@@ -283,16 +314,16 @@ private KeyStore getKeyStore() throws KeyStoreException, NoSuchAlgorithmExceptio
 
     /**
      * Load the truststore specified by environment variables, if specified
+     *
      * @return KeyStore representing the truststore provided by environment variable. If no truststore is specified
      * by environment variables null is returned.
      */
-    private KeyStore loadSystemTrustStore() throws KeyStoreException, IOException, NoSuchAlgorithmException,
-                CertificateException {
+    private KeyStore loadSystemTrustStore() throws KeyStoreException, IOException, NoSuchAlgorithmException, CertificateException {
         KeyStore store = null;
         String defaultTrustStoreLocation = System.getProperty(DEFAULT_TRUSTSTORE_PARAM);
-        if(defaultTrustStoreLocation != null) {
+        if (defaultTrustStoreLocation != null) {
             File defaultTrustStore = new File(defaultTrustStoreLocation);
-            if(defaultTrustStore.isFile() && defaultTrustStore.canRead()) {
+            if (defaultTrustStore.isFile() && defaultTrustStore.canRead()) {
                 store = KeyStore.getInstance(KeyStore.getDefaultType());
                 String trustStorePassword = System.getProperty(DEFAULT_TRUSTSTORE_PASS_PARAM);
                 try (FileInputStream fis = new FileInputStream(defaultTrustStore)) {
@@ -306,24 +337,25 @@ private KeyStore loadSystemTrustStore() throws KeyStoreException, IOException, N
 
     /**
      * Alias generator for the keystore entries.
-     * @return returns a String containing the alias for the next keystore entry 
+     *
+     * @return returns a String containing the alias for the next keystore entry
      */
     private String getNewAlias() {
         return "" + aliasID++;
     }
-    
+
     /**
-     * Attempts to load the pillars private key and certificate from a PEM formatted file. 
+     * Attempts to load the pillars private key and certificate from a PEM formatted file.
+     *
      * @param privateKeyFile path to the file containing the components private key and certificate, may be null
-     * @throws IOException if the file cannot be found or read. 
-     * @throws KeyStoreException if there is problems with adding the privateKeyEntry to keyStore
-     * @throws CertificateException 
+     * @throws IOException          if the file cannot be found or read.
+     * @throws KeyStoreException    if there is problems with adding the privateKeyEntry to keyStore
+     * @throws CertificateException if an error occurred while loading the certificate
      */
-    private void loadPrivateKey(String privateKeyFile) throws IOException, KeyStoreException, 
-            CertificateException {
+    private void loadPrivateKey(String privateKeyFile) throws IOException, KeyStoreException, CertificateException {
         PrivateKey privKey = null;
         X509Certificate privCert = null;
-        if(privateKeyFile == null || !(new File(privateKeyFile)).isFile()) {
+        if (privateKeyFile == null || !(new File(privateKeyFile)).isFile()) {
             log.info("Key file '" + privateKeyFile + "' with private key and certificate does not exist!");
             return;
         }
@@ -332,18 +364,17 @@ private void loadPrivateKey(String privateKeyFile) throws IOException, KeyStoreE
         PEMParser pemParser = new PEMParser(bufferedReader);
         Object pemObj = pemParser.readObject();
 
-        while(pemObj != null) {
-            if(pemObj instanceof X509Certificate) {
+        while (pemObj != null) {
+            if (pemObj instanceof X509Certificate) {
                 log.debug("Certificate for PrivateKeyEntry found");
                 privCert = (X509Certificate) pemObj;
-            } else if(pemObj instanceof PrivateKey) {
+            } else if (pemObj instanceof PrivateKey) {
                 log.debug("Key for PrivateKeyEntry found");
                 privKey = (PrivateKey) pemObj;
-            } else if(pemObj instanceof X509CertificateHolder ) {
+            } else if (pemObj instanceof X509CertificateHolder) {
                 log.debug("X509CertificateHolder found");
-                privCert = new JcaX509CertificateConverter().setProvider("BC")
-                        .getCertificate((X509CertificateHolder) pemObj);
-            } else if(pemObj instanceof PrivateKeyInfo) {
+                privCert = new JcaX509CertificateConverter().setProvider("BC").getCertificate((X509CertificateHolder) pemObj);
+            } else if (pemObj instanceof PrivateKeyInfo) {
                 log.debug("PrivateKeyInfo found");
                 PrivateKeyInfo pki = (PrivateKeyInfo) pemObj;
                 JcaPEMKeyConverter converter = new JcaPEMKeyConverter();
@@ -353,56 +384,58 @@ private void loadPrivateKey(String privateKeyFile) throws IOException, KeyStoreE
             }
             pemObj = pemParser.readObject();
         }
-        
+
         pemParser.close();
-        if(privKey == null || privCert == null ) {
+        if (privKey == null || privCert == null) {
             log.info("No material to create private key entry found!");
         } else {
             privCert.checkValidity();
-            privateKeyEntry = new PrivateKeyEntry(privKey, new Certificate[] {privCert});
-            keyStore.setEntry(SecurityModuleConstants.privateKeyAlias, privateKeyEntry, 
+            privateKeyEntry = new PrivateKeyEntry(privKey, new Certificate[]{privCert});
+            keyStore.setEntry(SecurityModuleConstants.privateKeyAlias, privateKeyEntry,
                     new KeyStore.PasswordProtection(defaultPassword.toCharArray()));
         }
     }
 
     /**
      * Load the appropriate certificates from PermissionSet into trust/keystore
+     *
      * @param permissions the permission set
-     * @throws CertificateException if certificate cannot be created from the data
      * @throws KeyStoreException if certificate cannot be put into the keyStore
      */
-    private void loadInfrastructureCertificates(PermissionSet permissions) throws CertificateException, KeyStoreException {
-        if(permissions == null) {
+    private void loadInfrastructureCertificates(PermissionSet permissions) throws KeyStoreException {
+        if (permissions == null) {
             log.info("The provided PermissionSet is empty. Continuing without permissions!");
             return;
         }
-        for(Permission permission : permissions.getPermission()) {
-            if(permission.getInfrastructurePermission().contains(InfrastructurePermission.MESSAGE_BUS_SERVER) 
-                    || permission.getInfrastructurePermission().contains(InfrastructurePermission.FILE_EXCHANGE_SERVER)) {
-	            try (ByteArrayInputStream bs = new ByteArrayInputStream(permission.getCertificate().getCertificateData())) {
-	                X509Certificate certificate = (X509Certificate) CertificateFactory.getInstance(
-	                        SecurityModuleConstants.CertificateType).generateCertificate(bs);
-	                certificate.checkValidity();
-	                keyStore.setEntry(getNewAlias(), new KeyStore.TrustedCertificateEntry(certificate), 
-	                        SecurityModuleConstants.nullProtectionParameter);
-	            } catch (CertificateException ce) {
-	                log.warn("Check of certificate validity failed, not adding certificate ({}) to keystore.", 
-	                        permission.getDescription(), ce);
-	            } catch (IOException e) {
-	                log.debug("Failed closing ByteArrayInputStream", e);
-	            }
+        for (Permission permission : permissions.getPermission()) {
+            if (permission.getInfrastructurePermission().contains(InfrastructurePermission.MESSAGE_BUS_SERVER) ||
+                    permission.getInfrastructurePermission().contains(InfrastructurePermission.FILE_EXCHANGE_SERVER)) {
+                try (ByteArrayInputStream bs = new ByteArrayInputStream(permission.getCertificate().getCertificateData())) {
+                    X509Certificate certificate = (X509Certificate) CertificateFactory.getInstance(SecurityModuleConstants.CertificateType)
+                            .generateCertificate(bs);
+                    certificate.checkValidity();
+                    keyStore.setEntry(getNewAlias(), new KeyStore.TrustedCertificateEntry(certificate),
+                            SecurityModuleConstants.nullProtectionParameter);
+                } catch (CertificateException ce) {
+                    log.warn("Check of certificate validity failed, not adding certificate ({}) to keystore.", permission.getDescription(),
+                            ce);
+                } catch (IOException e) {
+                    log.debug("Failed closing ByteArrayInputStream", e);
+                }
             }
-        }      
+        }
     }
-    
+
     /**
-     * Sets up the Default SSL context  
-     * @throws NoSuchAlgorithmException if the TrustStoreFactory does now know the TrustStoreAlgorithm
-     * @throws KeyStoreException if the TrustManagerFactory cannot be init'ed
+     * Sets up the Default SSL context
+     *
+     * @throws NoSuchAlgorithmException  if the TrustStoreFactory does now know the TrustStoreAlgorithm
+     * @throws KeyStoreException         if the TrustManagerFactory cannot be initialized
      * @throws UnrecoverableKeyException If the password is wrong
-     * @throws KeyManagementException if the SSL Context cannot be init'ed
+     * @throws KeyManagementException    if the SSL Context cannot be initialized
      */
-    private void setupDefaultSSLContext() throws NoSuchAlgorithmException, KeyStoreException, UnrecoverableKeyException, KeyManagementException {
+    private void setupDefaultSSLContext()
+            throws NoSuchAlgorithmException, KeyStoreException, UnrecoverableKeyException, KeyManagementException {
         TrustManagerFactory tmf;
         KeyManagerFactory kmf;
         SSLContext context;
diff --git a/bitrepository-core/src/main/java/org/bitrepository/protocol/security/CertificateID.java b/bitrepository-core/src/main/java/org/bitrepository/protocol/security/CertificateID.java
index 0d0427c9b..25e1bbdc3 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/protocol/security/CertificateID.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/protocol/security/CertificateID.java
@@ -5,44 +5,40 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.protocol.security;
 
-import java.io.IOException;
-import java.math.BigInteger;
+import org.bouncycastle.asn1.x500.X500Name;
 
 import javax.security.auth.x500.X500Principal;
-import org.bouncycastle.asn1.x500.X500Name;
+import java.io.IOException;
+import java.math.BigInteger;
 
 /**
- * Class to be used as an identifier of certificates. 
- * Identification is based on the issuer (X500Principal) and the certificates serial number. 
- * Those combined should provide a unique ID, and the information can be extracted from a signature.      
+ * Class to be used as an identifier of certificates.
+ * Identification is based on the issuer (X500Principal) and the certificates serial number.
+ * Those combined should provide a unique ID, and the information can be extracted from a signature.
  */
 public class CertificateID {
-
-    /** Identifying object of the issuer of a certificate */
     private final X500Principal issuer;
-    /** The serial number of a certificate (unique within an issuer) */
     private final BigInteger serial;
 
     /**
-     * Constructor for the class.
-     * @param issuer The X500Principal object that identifies the certificate issuer.
-     * 				 Can be extracted from a SignerID and a X509Certificate
+     * @param issuer       The X500Principal object that identifies the certificate issuer.
+     *                     Can be extracted from a SignerID and a X509Certificate
      * @param serialNumber The certificates SerialNumber, ca be extracted from a SignerID and a X509Certificate
      */
     public CertificateID(X500Principal issuer, BigInteger serialNumber) {
@@ -83,11 +79,8 @@ public boolean equals(Object obj) {
         } else if (!issuer.equals(other.issuer))
             return false;
         if (serial == null) {
-            if (other.serial != null)
-                return false;
-        } else if (!serial.equals(other.serial))
-            return false;
-        return true;
+            return other.serial == null;
+        } else return serial.equals(other.serial);
     }
 
     @Override
@@ -96,16 +89,16 @@ public String toString() {
     }
 
     /**
-     * @see CertificateID constructor
      * @return Identifying object of the issuer of a certificate
+     * @see CertificateID constructor
      */
     public X500Principal getIssuer() {
         return issuer;
     }
 
     /**
-     * @see CertificateID constructor
      * @return The serial number of a certificate (unique within an issuer)
+     * @see CertificateID constructor
      */
     public BigInteger getSerial() {
         return serial;
diff --git a/bitrepository-core/src/main/java/org/bitrepository/protocol/security/MessageAuthenticator.java b/bitrepository-core/src/main/java/org/bitrepository/protocol/security/MessageAuthenticator.java
index e91c6b89f..b5b5729cb 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/protocol/security/MessageAuthenticator.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/protocol/security/MessageAuthenticator.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -25,16 +25,17 @@
 import org.bouncycastle.cms.SignerId;
 
 /**
- * Interface for classes to authenticate messages based on a CMS signature. 
+ * Interface for classes to authenticate messages based on a CMS signature.
  */
 public interface MessageAuthenticator {
 
     /**
      * Method to authenticate a message based on a signature.
-     * @param messageData the data to authenticate
+     *
+     * @param messageData   the data to authenticate
      * @param signatureData the signature to authenticate the message from
      * @return The ID of the message signer
-     * @throws MessageAuthenticationException in case authentication fails. 
+     * @throws MessageAuthenticationException in case authentication fails.
      */
-    abstract SignerId authenticateMessage(byte[] messageData, byte[] signatureData) throws MessageAuthenticationException;
+    SignerId authenticateMessage(byte[] messageData, byte[] signatureData) throws MessageAuthenticationException;
 }
diff --git a/bitrepository-core/src/main/java/org/bitrepository/protocol/security/MessageSigner.java b/bitrepository-core/src/main/java/org/bitrepository/protocol/security/MessageSigner.java
index b56dcb045..d96e8d105 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/protocol/security/MessageSigner.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/protocol/security/MessageSigner.java
@@ -5,42 +5,44 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.protocol.security;
 
-import java.security.KeyStore.PrivateKeyEntry;
-
 import org.bitrepository.protocol.security.exception.MessageSigningException;
 
+import java.security.KeyStore.PrivateKeyEntry;
+
 /**
- * Interface for classes using CMS to sign messages. 
+ * Interface for classes using CMS to sign messages.
  */
 public interface MessageSigner {
 
     /**
-     * Setter method for setting the PrivateKeyEntry needed by implementers to sign messages. 
-     * @param privateKeyEntry the PrivateKeyEntry used for signing messages. 
+     * Setter method for setting the PrivateKeyEntry needed by implementers to sign messages.
+     *
+     * @param privateKeyEntry the PrivateKeyEntry used for signing messages.
      */
-    abstract void setPrivateKeyEntry(PrivateKeyEntry privateKeyEntry);
-    
+    void setPrivateKeyEntry(PrivateKeyEntry privateKeyEntry);
+
     /**
      * Method to sign a message.
+     *
      * @param messageData The messages in byte raw byte form
-     * @return The raw signature. 
-     * @throws MessageSigningException if the signing fails. 
+     * @return The raw signature.
+     * @throws MessageSigningException if the signing fails.
      */
-    abstract byte[] signMessage(byte[] messageData) throws MessageSigningException;
+    byte[] signMessage(byte[] messageData) throws MessageSigningException;
 }
diff --git a/bitrepository-core/src/main/java/org/bitrepository/protocol/security/OperationAuthorizer.java b/bitrepository-core/src/main/java/org/bitrepository/protocol/security/OperationAuthorizer.java
index 70a299993..a5c573a2c 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/protocol/security/OperationAuthorizer.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/protocol/security/OperationAuthorizer.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -27,27 +27,28 @@
 import org.bouncycastle.cms.SignerId;
 
 /**
- * Class to authorize an operation based on the certificate which has signed the operation request.  
+ * Class to authorize an operation based on the certificate which has signed the operation request.
  */
 public interface OperationAuthorizer {
 
     /**
      * Authorize an operation based on its signature
+     *
      * @param operationType operationType, the type of operation that should be authorized.
-     * @param signer The signer of the request.
-     * @param collectionID The ID of the collection to autorize the operation for.
-     * @throws OperationAuthorizationException if the authorization fails.  
+     * @param signer        The signer of the request.
+     * @param collectionID  The ID of the collection to authorize the operation for.
+     * @throws OperationAuthorizationException if the authorization fails.
      * @throws UnregisteredPermissionException if no permissions could be found for the signer
      */
     void authorizeOperation(String operationType, SignerId signer, String collectionID)
             throws OperationAuthorizationException, UnregisteredPermissionException;
-    
+
     /**
      * Method to determine whether a given componentID is allowed to sign an operation with the given certificate.
+     *
      * @param certificateUser the componentID of the component that signed the message
-     * @param signer the signerId of the certificate that signed the message
-     * @throws CertificateUseException in case the message has been signed by the wrong user. 
-     * 
+     * @param signer          the signerId of the certificate that signed the message
+     * @throws CertificateUseException in case the message has been signed by the wrong user.
      */
     void authorizeCertificateUse(String certificateUser, SignerId signer) throws CertificateUseException;
 
diff --git a/bitrepository-core/src/main/java/org/bitrepository/protocol/security/PermissionStore.java b/bitrepository-core/src/main/java/org/bitrepository/protocol/security/PermissionStore.java
index f1a55f983..cc43384e7 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/protocol/security/PermissionStore.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/protocol/security/PermissionStore.java
@@ -5,22 +5,35 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.protocol.security;
 
+import org.apache.commons.codec.digest.DigestUtils;
+import org.bitrepository.protocol.security.exception.PermissionStoreException;
+import org.bitrepository.protocol.security.exception.UnregisteredPermissionException;
+import org.bitrepository.settings.repositorysettings.InfrastructurePermission;
+import org.bitrepository.settings.repositorysettings.Operation;
+import org.bitrepository.settings.repositorysettings.OperationPermission;
+import org.bitrepository.settings.repositorysettings.Permission;
+import org.bitrepository.settings.repositorysettings.PermissionSet;
+import org.bouncycastle.cms.SignerId;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.security.Provider;
@@ -36,34 +49,23 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.codec.digest.DigestUtils;
-import org.bitrepository.protocol.security.exception.PermissionStoreException;
-import org.bitrepository.protocol.security.exception.UnregisteredPermissionException;
-import org.bitrepository.settings.repositorysettings.InfrastructurePermission;
-import org.bitrepository.settings.repositorysettings.Operation;
-import org.bitrepository.settings.repositorysettings.OperationPermission;
-import org.bitrepository.settings.repositorysettings.Permission;
-import org.bitrepository.settings.repositorysettings.PermissionSet;
-import org.bouncycastle.cms.SignerId;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
  * Class to hold the concept of permissions used in the Bitrepository.
  * The class contains functionality to:
  * - Hold the correlation between certificates and the permissions related to them.
  * - Test if a certificate has a requested permission
- * - Retreive a certificate from the store.
+ * - Retrieve a certificate from the store.
  */
 public class PermissionStore {
 
     private final Logger log = LoggerFactory.getLogger(PermissionStore.class);
-    /** Mapping from certificate identifier to an object containing the certificate and the permissions registered with it*/
-    private Map<CertificateID, CertificatePermission> permissionMap;
+    /**
+     * Mapping from certificate identifier to an object containing the certificate and the permissions registered with it
+     */
+    private final Map<CertificateID, CertificatePermission> permissionMap;
 
     /**
-     * Public constructor, initializes the store. 
+     * Public constructor, initializes the store.
      */
     public PermissionStore() {
         permissionMap = new HashMap<>();
@@ -73,53 +75,50 @@ public PermissionStore() {
 
     /**
      * Load permissions and certificates into the store based.
+     *
      * @param permissions the PermissionSet from RepositorySettings.
-     * @param componentID the ID of the component using the PermissionStore. 
-     * @throws CertificateException in case a bad certificate data in PermissionSet.   
+     * @param componentID the ID of the component using the PermissionStore.
      */
-    public void loadPermissions(PermissionSet permissions, String componentID) throws CertificateException {
-        if(permissions != null) {
+    public void loadPermissions(PermissionSet permissions, String componentID) {
+        if (permissions != null) {
             Set<OperationPermission> allowedOperationPermissions;
             Set<String> allowedUsers;
-            for(Permission permission : permissions.getPermission()) {
+            for (Permission permission : permissions.getPermission()) {
                 try {
-                    if(permission.getCertificate().getAllowedCertificateUsers() != null) {
-                        allowedUsers = new HashSet<>();
-                        allowedUsers.addAll(permission.getCertificate().getAllowedCertificateUsers().getIDs());
+                    if (permission.getCertificate().getAllowedCertificateUsers() != null) {
+                        allowedUsers = new HashSet<>(permission.getCertificate().getAllowedCertificateUsers().getIDs());
                     } else {
                         allowedUsers = null;
                     }
-    
+
                     allowedOperationPermissions = new HashSet<>();
                     X509Certificate certificate = null;
-                    if(permission.getOperationPermission() != null) {
-                        for(OperationPermission perm : permission.getOperationPermission()) {
-                            if(perm.getAllowedComponents() == null ||
-                                    perm.getAllowedComponents().getIDs().contains(componentID)) {
+                    if (permission.getOperationPermission() != null) {
+                        for (OperationPermission perm : permission.getOperationPermission()) {
+                            if (perm.getAllowedComponents() == null || perm.getAllowedComponents().getIDs().contains(componentID)) {
                                 allowedOperationPermissions.add(perm);
                             }
                         }
-                        if(!allowedOperationPermissions.isEmpty()) {
+                        if (!allowedOperationPermissions.isEmpty()) {
                             certificate = makeCertificate(permission.getCertificate().getCertificateData());
                         }
                     }
-                    if(permission.getInfrastructurePermission().contains(InfrastructurePermission.MESSAGE_SIGNER)) {
-                        if(certificate == null) {
+                    if (permission.getInfrastructurePermission().contains(InfrastructurePermission.MESSAGE_SIGNER)) {
+                        if (certificate == null) {
                             certificate = makeCertificate(permission.getCertificate().getCertificateData());
                         }
                     }
-    
-                    if(certificate != null) {
-                        CertificateID certID = new CertificateID(certificate.getIssuerX500Principal(),
-                                certificate.getSerialNumber());
-                        CertificatePermission certificatePermission = new CertificatePermission(certificate, 
-                                allowedOperationPermissions, allowedUsers);
+
+                    if (certificate != null) {
+                        CertificateID certID = new CertificateID(certificate.getIssuerX500Principal(), certificate.getSerialNumber());
+                        CertificatePermission certificatePermission = new CertificatePermission(certificate, allowedOperationPermissions,
+                                allowedUsers);
                         permissionMap.put(certID, certificatePermission);
                     }
                 } catch (CertificateException ce) {
-                    log.warn("Failed handle certificate with description '{}'. Certificate not added to permission store.", 
+                    log.warn("Failed handle certificate with description '{}'. Certificate not added to permission store.",
                             permission.getDescription(), ce);
-                } 
+                }
             }
         } else {
             log.info("The provided PermissionSet was null");
@@ -128,42 +127,42 @@ public void loadPermissions(PermissionSet permissions, String componentID) throw
 
     /**
      * Retrieve the certificate based on the signerId.
+     *
      * @param signer the identification data of the certificate to retrieve
      * @return X509Certificate the certificate represented by the SignerId
-     * @throws PermissionStoreException if no certificate can be found based on the SignerId 
+     * @throws PermissionStoreException if no certificate can be found based on the SignerId
      */
     public X509Certificate getCertificate(SignerId signer) throws PermissionStoreException {
         CertificateID certificateID = new CertificateID(signer.getIssuer(), signer.getSerialNumber());
         CertificatePermission permission = permissionMap.get(certificateID);
-        if(permission != null) {
+        if (permission != null) {
             return permission.getCertificate();
         } else {
-            throw new PermissionStoreException("Failed to find certificate for the requested signer:" + certificateID.toString());
+            throw new PermissionStoreException("Failed to find certificate for the requested signer:" + certificateID);
         }
     }
 
     /**
-     * @param signer the signerId of the certificate used to sign the message.
+     * @param signer          the signerId of the certificate used to sign the message.
      * @param certificateUser the user that claims to have used the certificate.
      * @return true, if the certificateUser has been registered for use of the certificate indicated by signer,
-     *         false otherwise.
+     * false otherwise.
      * @throws PermissionStoreException in case no certificate has been registered for the given signerId
      */
     public boolean checkCertificateUser(SignerId signer, String certificateUser) throws PermissionStoreException {
         CertificateID certificateID = new CertificateID(signer.getIssuer(), signer.getSerialNumber());
         CertificatePermission certificatePermission = permissionMap.get(certificateID);
-        if(certificatePermission == null) {
-            throw new PermissionStoreException("Failed to find certificate and permissions for the requested signer: " +
-                    certificateID.toString());
+        if (certificatePermission == null) {
+            throw new PermissionStoreException("Failed to find certificate and permissions for the requested signer: " + certificateID);
         } else {
             return certificatePermission.isUserAllowed(certificateUser);
         }
     }
 
     /**
-     * @return  the store fingerprint for the signers certificate.
      * @param signer the id of the signer
-     * @throws UnregisteredPermissionException No finger print could be found for the indicated signer.
+     * @return the store fingerprint for the signers certificate.
+     * @throws UnregisteredPermissionException No finger-print could be found for the indicated signer.
      */
     public String getCertificateFingerprint(SignerId signer) throws UnregisteredPermissionException {
         CertificateID certificateID = new CertificateID(signer.getIssuer(), signer.getSerialNumber());
@@ -176,10 +175,11 @@ public String getCertificateFingerprint(SignerId signer) throws UnregisteredPerm
     }
 
     /**
-     * Check to see if a certificate has the specified permission for the specified collection. 
+     * Check to see if a certificate has the specified permission for the specified collection.
      * The certificate is identified based on the SignerId of the signature.
-     * @param signer the id of the signer
-     * @param permission the operation to check if is permitted
+     *
+     * @param signer       the id of the signer
+     * @param permission   the operation to check if is permitted
      * @param collectionID The ID of the collection to check for permission
      * @return true if the requested permission is present for the certificate belonging to the signer, otherwise false.
      * @throws PermissionStoreException in case no certificate and permission set can be found for the provided signer.
@@ -187,9 +187,8 @@ public String getCertificateFingerprint(SignerId signer) throws UnregisteredPerm
     public boolean checkPermission(SignerId signer, Operation permission, String collectionID) throws PermissionStoreException {
         CertificateID certificateID = new CertificateID(signer.getIssuer(), signer.getSerialNumber());
         CertificatePermission certificatePermission = permissionMap.get(certificateID);
-        if(certificatePermission == null) {
-            throw new PermissionStoreException("Failed to find certificate and permissions for the requested signer: " +
-                    certificateID.toString());
+        if (certificatePermission == null) {
+            throw new PermissionStoreException("Failed to find certificate and permissions for the requested signer: " + certificateID);
         } else {
             return certificatePermission.hasPermission(permission, collectionID);
         }
@@ -197,15 +196,16 @@ public boolean checkPermission(SignerId signer, Operation permission, String col
 
     /**
      * Creates a X509Certificate and checks its validity
-     * @param certificateData The certificate data 
+     *
+     * @param certificateData The certificate data
      * @return {@link X509Certificate} The certificate represented by the input data
-     * @throws CertificateException upon failure to parse the certificate data to a certificate 
-     * or if the certificate fails the validity check.  
+     * @throws CertificateException upon failure to parse the certificate data to a certificate
+     *                              or if the certificate fails the validity check.
      */
     private X509Certificate makeCertificate(byte[] certificateData) throws CertificateException {
         ByteArrayInputStream bs = new ByteArrayInputStream(certificateData);
-        X509Certificate certificate = (X509Certificate) CertificateFactory.getInstance(
-                SecurityModuleConstants.CertificateType).generateCertificate(bs);
+        X509Certificate certificate = (X509Certificate) CertificateFactory.getInstance(SecurityModuleConstants.CertificateType)
+                .generateCertificate(bs);
         try {
             bs.close();
         } catch (IOException e) {
@@ -216,12 +216,12 @@ private X509Certificate makeCertificate(byte[] certificateData) throws Certifica
     }
 
     /**
-     * Class to contain a X509Certificate and the permissions associated with it.    
+     * Class to contain a X509Certificate and the permissions associated with it.
      */
-    private final class CertificatePermission {
+    private static final class CertificatePermission {
         /**
          * Mapping between Operation and collections allowed to use them. If the list of collections is either
-         * null or empty, then no collection limitation/restriction is applied.  
+         * null or empty, then no collection limitation/restriction is applied.
          */
         private final Map<Operation, List<String>> permissions;
         private final Set<String> allowedUsers;
@@ -229,14 +229,14 @@ private final class CertificatePermission {
         private final String fingerprint;
 
         /**
-         * @param certificate the certificate which permissions is to be represented.
-         * @param allowedOperations the allowed operations related to the certificate.
-         * @param allowedUsers the allowed users of this certificate, if users are not restricted provide null
-         * @throws CertificateEncodingException if the certificate fails to be encoded
+         * @param certificate                 the certificate which permissions are to be represented.
+         * @param allowedOperationPermissions a set of allowed operation permissions.
+         * @param allowedUsers                the allowed users of this certificate, if users are not restricted provide null.
+         * @throws CertificateEncodingException if the certificate fails to be encoded.
          */
-        public CertificatePermission(X509Certificate certificate, Set<OperationPermission> allowedOperationPermissions, 
-                Collection<String> allowedUsers) throws CertificateEncodingException {
-            if(allowedUsers == null) {
+        public CertificatePermission(X509Certificate certificate, Set<OperationPermission> allowedOperationPermissions,
+                                     Collection<String> allowedUsers) throws CertificateEncodingException {
+            if (allowedUsers == null) {
                 this.allowedUsers = null;
             } else {
                 this.allowedUsers = new HashSet<>();
@@ -244,23 +244,24 @@ public CertificatePermission(X509Certificate certificate, Set<OperationPermissio
             }
             this.permissions = new HashMap<>();
             this.certificate = certificate;
-            for(OperationPermission opPerm : allowedOperationPermissions) {
+            for (OperationPermission opPerm : allowedOperationPermissions) {
                 this.permissions.put(opPerm.getOperation(), opPerm.getCollections());
             }
             this.fingerprint = DigestUtils.sha1Hex(certificate.getEncoded());
         }
 
         /**
-         *  Test if a certain permission has been registered for this object. 
-         *  @param permission the permission to test for
-         *  @param collectionID the collection to check for the permission in
-         *  @return true if the permission is registered, false otherwise.
+         * Test if a certain permission has been registered for this object.
+         *
+         * @param permission   the permission to test for
+         * @param collectionID the collection to check for the permission in
+         * @return true if the permission is registered, false otherwise.
          */
         public boolean hasPermission(Operation permission, String collectionID) {
             boolean allowed = false;
-            if(permissions.containsKey(permission)) {
+            if (permissions.containsKey(permission)) {
                 List<String> allowedCollections = permissions.get(permission);
-                if(allowedCollections == null || allowedCollections.isEmpty() || allowedCollections.contains(collectionID)) {
+                if (allowedCollections == null || allowedCollections.isEmpty() || allowedCollections.contains(collectionID)) {
                     allowed = true;
                 }
             }
@@ -268,12 +269,13 @@ public boolean hasPermission(Operation permission, String collectionID) {
         }
 
         /**
-         *  Test if a certain certificate user has been registered as one allowed for use of this certificate.
-         *  @param certificateUser the user to test for
-         *  @return true if the user has been registered, false otherwise. 
+         * Test if a certain certificate user has been registered as one allowed for use of this certificate.
+         *
+         * @param certificateUser the user to test for
+         * @return true if the user has been registered, false otherwise.
          */
         public boolean isUserAllowed(String certificateUser) {
-            if(allowedUsers == null) {
+            if (allowedUsers == null) {
                 return true;
             } else {
                 return allowedUsers.contains(certificateUser);
@@ -281,7 +283,8 @@ public boolean isUserAllowed(String certificateUser) {
         }
 
         /**
-         * Retrieve the certificate from the object. 
+         * Retrieve the certificate from the object.
+         *
          * @return the X509Certificate from the object.
          */
         public X509Certificate getCertificate() {
diff --git a/bitrepository-core/src/main/java/org/bitrepository/protocol/security/RequestToOperationPermissionMapper.java b/bitrepository-core/src/main/java/org/bitrepository/protocol/security/RequestToOperationPermissionMapper.java
index f2565e763..76035d1b8 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/protocol/security/RequestToOperationPermissionMapper.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/protocol/security/RequestToOperationPermissionMapper.java
@@ -5,27 +5,22 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.protocol.security;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 import org.bitrepository.bitrepositorymessages.DeleteFileRequest;
 import org.bitrepository.bitrepositorymessages.GetAuditTrailsRequest;
 import org.bitrepository.bitrepositorymessages.GetChecksumsRequest;
@@ -45,16 +40,23 @@
 import org.bitrepository.protocol.security.exception.UnregisteredPermissionException;
 import org.bitrepository.settings.repositorysettings.Operation;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
- * Class to map between a Operation/RequestType (Bitrepository message request type) and
- * the permissions required to allowed execution of the operation. 
+ * Class to map between an Operation/RequestType (Bitrepository message request type) and
+ * the permissions required to allowed execution of the operation.
  */
 public class RequestToOperationPermissionMapper {
-    /** Mapping from MessageRequest type to a list of permissions */
+    /**
+     * Mapping from MessageRequest type to a list of permissions
+     */
     private final Map<String, List<Operation>> mapping;
 
     /**
-     * Constructor for the class. Initiates the default permission mappings.  
+     * Constructor for the class. Initiates the default permission mappings.
      */
     public RequestToOperationPermissionMapper() {
         mapping = new HashMap<>();
@@ -63,37 +65,37 @@ public RequestToOperationPermissionMapper() {
         requiredPermissions.add(Operation.GET_FILE);
         mapping.put(IdentifyPillarsForGetFileRequest.class.getSimpleName(), requiredPermissions);
         mapping.put(GetFileRequest.class.getSimpleName(), requiredPermissions);
-        
+
         requiredPermissions = new ArrayList<>();
         requiredPermissions.add(Operation.ALL);
         requiredPermissions.add(Operation.PUT_FILE);
         mapping.put(IdentifyPillarsForPutFileRequest.class.getSimpleName(), requiredPermissions);
         mapping.put(PutFileRequest.class.getSimpleName(), requiredPermissions);
-        
+
         requiredPermissions = new ArrayList<>();
         requiredPermissions.add(Operation.ALL);
         requiredPermissions.add(Operation.GET_FILE_I_DS);
         mapping.put(IdentifyPillarsForGetFileIDsRequest.class.getSimpleName(), requiredPermissions);
         mapping.put(GetFileIDsRequest.class.getSimpleName(), requiredPermissions);
-        
+
         requiredPermissions = new ArrayList<>();
         requiredPermissions.add(Operation.ALL);
         requiredPermissions.add(Operation.GET_CHECKSUMS);
         mapping.put(IdentifyPillarsForGetChecksumsRequest.class.getSimpleName(), requiredPermissions);
         mapping.put(GetChecksumsRequest.class.getSimpleName(), requiredPermissions);
-        
+
         requiredPermissions = new ArrayList<>();
         requiredPermissions.add(Operation.ALL);
         requiredPermissions.add(Operation.GET_AUDIT_TRAILS);
         mapping.put(IdentifyContributorsForGetAuditTrailsRequest.class.getSimpleName(), requiredPermissions);
         mapping.put(GetAuditTrailsRequest.class.getSimpleName(), requiredPermissions);
-        
+
         requiredPermissions = new ArrayList<>();
         requiredPermissions.add(Operation.ALL);
         requiredPermissions.add(Operation.DELETE_FILE);
         mapping.put(IdentifyPillarsForDeleteFileRequest.class.getSimpleName(), requiredPermissions);
         mapping.put(DeleteFileRequest.class.getSimpleName(), requiredPermissions);
-        
+
         requiredPermissions = new ArrayList<>();
         requiredPermissions.add(Operation.ALL);
         requiredPermissions.add(Operation.REPLACE_FILE);
@@ -108,13 +110,13 @@ public RequestToOperationPermissionMapper() {
     }
 
     /**
-     * @param operationType the operationtype
+     * @param operationType the operation type
      * @return the required permission for the given operation type (bitrepository message request type)
      * @throws UnregisteredPermissionException if no permissions have been registered for this operationType
      */
     public List<Operation> getRequiredPermissions(String operationType) throws UnregisteredPermissionException {
         List<Operation> permissions = mapping.get(operationType);
-        if(permissions == null) {
+        if (permissions == null) {
             throw new UnregisteredPermissionException("No permissions has been registered for: " + operationType);
         }
         return permissions;
diff --git a/bitrepository-core/src/main/java/org/bitrepository/protocol/security/SecurityManager.java b/bitrepository-core/src/main/java/org/bitrepository/protocol/security/SecurityManager.java
index a5b81db8a..4e864b701 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/protocol/security/SecurityManager.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/protocol/security/SecurityManager.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -30,45 +30,49 @@
 
 public interface SecurityManager {
     /**
-     * Method to authenticate a message. 
-     * @param message the message that needs to be authenticated.
+     * Method to authenticate a message.
+     *
+     * @param message   the message that needs to be authenticated.
      * @param signature the signature belonging to the message.
      * @return The certificate used to sign the message
      * @throws MessageAuthenticationException in case of failure.
      */
     SignerId authenticateMessage(String message, String signature) throws MessageAuthenticationException;
-    
+
     /**
      * Method to sign a message
+     *
      * @param message the message to sign
      * @return the signature for the message, or null if authentication is disabled.
-     * @throws MessageSigningException if signing of the message fails.   
+     * @throws MessageSigningException if signing of the message fails.
      */
     String signMessage(String message) throws MessageSigningException;
-    
+
     /**
-     * Method to authorize an operation 
+     * Method to authorize an operation
+     *
      * @param operationType the type of operation that is to be authorized.
-     * @param messageData the data of the message request.
-     * @param signature the signature belonging to the message request.
-     * @param collectionID the collection to authorize the operation for
-     * @throws OperationAuthorizationException in case of failure. 
+     * @param messageData   the data of the message request.
+     * @param signature     the signature belonging to the message request.
+     * @param collectionID  the collection to authorize the operation for
+     * @throws OperationAuthorizationException in case of failure.
      */
-    void authorizeOperation(String operationType, String messageData, String signature, String collectionID) 
+    void authorizeOperation(String operationType, String messageData, String signature, String collectionID)
             throws OperationAuthorizationException;
-    
-    /** 
+
+    /**
      * Method to authorize the use of a certificate
+     *
      * @param certificateUser the user who signed the message
-     * @param messageData the data of the message request.
-     * @param signature the signature belonging to the message request.
-     * @throws CertificateUseException in case the certificate use could not be authorized. 
+     * @param messageData     the data of the message request.
+     * @param signature       the signature belonging to the message request.
+     * @throws CertificateUseException in case the certificate use could not be authorized.
      */
-    void authorizeCertificateUse(String certificateUser, String messageData, String signature) 
-            throws CertificateUseException;
+    void authorizeCertificateUse(String certificateUser, String messageData, String signature) throws CertificateUseException;
 
     /**
      * Returns the fingerprint for the certificate.
+     *
      * @param signer The signer to lookup the certificate fingerprint for.
      * @return The fingerprint of the certificate used to sign a message .
      * @throws UnregisteredPermissionException No permission has been registered for this signer.
diff --git a/bitrepository-core/src/main/java/org/bitrepository/protocol/security/SecurityManagerUtil.java b/bitrepository-core/src/main/java/org/bitrepository/protocol/security/SecurityManagerUtil.java
index eeb2255c4..8e3030835 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/protocol/security/SecurityManagerUtil.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/protocol/security/SecurityManagerUtil.java
@@ -1,29 +1,31 @@
 package org.bitrepository.protocol.security;
 
-import java.nio.file.Path;
-
 import org.bitrepository.common.settings.Settings;
 
+import java.nio.file.Path;
+
 /**
  * Utility class for abstracting away the work of creating a SecurityManager
  */
 public class SecurityManagerUtil {
-    
+
     /**
-     * Shorthand method to obtain a security manager, componentID is derived from settings. 
-     * @param settings The settings to create the security manager for
+     * Shorthand method to obtain a security manager, componentID is derived from settings.
+     *
+     * @param settings             The settings to create the security manager for
      * @param componentCertificate Path to the certificate for the component which should use the SecurityManager
      * @return {@link SecurityManager} The security manager
      */
     public static SecurityManager getSecurityManager(Settings settings, Path componentCertificate) {
         return getSecurityManager(settings, componentCertificate, settings.getComponentID());
     }
-    
+
     /**
      * Shorthand method to obtain a security manager
-     * @param settings The settings to create the security manager for
+     *
+     * @param settings             The settings to create the security manager for
      * @param componentCertificate Path to the certificate for the component which should use the SecurityManager
-     * @param componentID The ID of the component
+     * @param componentID          The ID of the component
      * @return {@link SecurityManager} The security manager
      */
     public static SecurityManager getSecurityManager(Settings settings, Path componentCertificate, String componentID) {
diff --git a/bitrepository-core/src/main/java/org/bitrepository/protocol/security/SecurityModuleConstants.java b/bitrepository-core/src/main/java/org/bitrepository/protocol/security/SecurityModuleConstants.java
index f9566a9e3..992168595 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/protocol/security/SecurityModuleConstants.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/protocol/security/SecurityModuleConstants.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -26,27 +26,48 @@
 
 public class SecurityModuleConstants {
 
-    private SecurityModuleConstants() {}
-    
-    /** Constant for selecting the BouncyCastle security provider */
+    private SecurityModuleConstants() {
+    }
+
+    /**
+     * Constant for selecting the BouncyCastle security provider
+     */
     public static final String BC = "BC";
-    /** Type of signature used for message signing */
+    /**
+     * Type of signature used for message signing
+     */
     public static final String SignatureType = "SHA512withRSA";
-    /** The certificate type used */
+    /**
+     * The certificate type used
+     */
     public static final String CertificateType = "X.509";
-    /** The default encoding type for encoding/decoding signatures and certificate data */
+    /**
+     * The default encoding type for encoding/decoding signatures and certificate data
+     */
     public static final String defaultEncodingType = "UTF-8";
-    /** The keystore implementation used. */
+    /**
+     * The keystore implementation used.
+     */
     public static final String keyStoreType = "BKS";
-    /** Keystore alias for the private key entry */
+    /**
+     * Keystore alias for the private key entry
+     */
     public static final String privateKeyAlias = "PrivateKey";
-    /** Default protection parameter for 'normal' keystore entries */
+    /**
+     * Default protection parameter for 'normal' keystore entries
+     */
     public static final ProtectionParameter nullProtectionParameter = null;
-    /** The default Key- and TrustStore algorithm */
+    /**
+     * The default Key- and TrustStore algorithm
+     */
     public static final String keyTrustStoreAlgorithm = "SunX509";
-    /** The default SSL org.bitrepository.org.bitrepository.protocol type*/
+    /**
+     * The default SSL org.bitrepository.org.bitrepository.protocol type
+     */
     public static final String defaultSSLProtocol = "TLS";
-    /** The default SecureRandom for SSLContext generation */
+    /**
+     * The default SecureRandom for SSLContext generation
+     */
     public static final SecureRandom defaultRandom = null;
 }
 
diff --git a/bitrepository-core/src/main/java/org/bitrepository/protocol/security/exception/CertificateUseException.java b/bitrepository-core/src/main/java/org/bitrepository/protocol/security/exception/CertificateUseException.java
index b6b6b6506..cd9acf68f 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/protocol/security/exception/CertificateUseException.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/protocol/security/exception/CertificateUseException.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -22,23 +22,25 @@
 package org.bitrepository.protocol.security.exception;
 
 /**
- *  Exception class to indicate that a certificate has been used by someone who should not.  
+ * Exception class to indicate that a certificate has been used by someone who should not.
  */
 @SuppressWarnings("serial")
 public class CertificateUseException extends Exception {
-    
-    /** 
+
+    /**
      * Constructor for MessageAuthenticationException
+     *
      * @param message the message describing the reason for the exception
      */
     public CertificateUseException(String message) {
         super(message);
     }
-    
-    /** 
+
+    /**
      * Constructor for MessageAuthenticationException
+     *
      * @param message the message describing the reason for the exception
-     * @param cause the cause for throwing the exception
+     * @param cause   the cause for throwing the exception
      */
     public CertificateUseException(String message, Throwable cause) {
         super(message, cause);
diff --git a/bitrepository-core/src/main/java/org/bitrepository/protocol/security/exception/MessageAuthenticationException.java b/bitrepository-core/src/main/java/org/bitrepository/protocol/security/exception/MessageAuthenticationException.java
index cc7d41d46..4418fb727 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/protocol/security/exception/MessageAuthenticationException.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/protocol/security/exception/MessageAuthenticationException.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -22,22 +22,23 @@
 package org.bitrepository.protocol.security.exception;
 
 /**
- * Exception class to indicate that authentication of a message has failed.  
+ * Exception class to indicate that authentication of a message has failed.
  */
 @SuppressWarnings("serial")
 public class MessageAuthenticationException extends Exception {
-    
+
     /**
      * @param message the message describing the reason for the exception
      */
     public MessageAuthenticationException(String message) {
         super(message);
     }
-    
+
     /**
      * Constructor for MessageAuthenticationException
+     *
      * @param message the message describing the reason for the exception
-     * @param e the exception that caused the creation of MessageAuthenticationException
+     * @param e       the exception that caused the creation of MessageAuthenticationException
      */
     public MessageAuthenticationException(String message, Throwable e) {
         super(message, e);
diff --git a/bitrepository-core/src/main/java/org/bitrepository/protocol/security/exception/MessageSigningException.java b/bitrepository-core/src/main/java/org/bitrepository/protocol/security/exception/MessageSigningException.java
index 0d1db1f93..92bf790f6 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/protocol/security/exception/MessageSigningException.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/protocol/security/exception/MessageSigningException.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -22,23 +22,25 @@
 package org.bitrepository.protocol.security.exception;
 
 /**
- * Exception class to indicate that signing of a message has failed. 
+ * Exception class to indicate that signing of a message has failed.
  */
 @SuppressWarnings("serial")
 public class MessageSigningException extends Exception {
 
-    /** 
+    /**
      * Constructor for MessageSigningException
+     *
      * @param message the message describing the reason for the exception
      */
     public MessageSigningException(String message) {
         super(message);
     }
-    
+
     /**
      * Constructor for MessageSigningException
+     *
      * @param message the message describing what caused the exception
-     * @param cause the throwable object that caused the exception 
+     * @param cause   the throwable object that caused the exception
      */
     public MessageSigningException(String message, Throwable cause) {
         super(message, cause);
diff --git a/bitrepository-core/src/main/java/org/bitrepository/protocol/security/exception/OperationAuthorizationException.java b/bitrepository-core/src/main/java/org/bitrepository/protocol/security/exception/OperationAuthorizationException.java
index 25aa6da5f..66c3180e6 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/protocol/security/exception/OperationAuthorizationException.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/protocol/security/exception/OperationAuthorizationException.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -22,7 +22,7 @@
 package org.bitrepository.protocol.security.exception;
 
 /**
- * Exception class to indicate that authorization of an operation has failed.  
+ * Exception class to indicate that authorization of an operation has failed.
  */
 @SuppressWarnings("serial")
 public class OperationAuthorizationException extends Exception {
@@ -33,12 +33,13 @@ public class OperationAuthorizationException extends Exception {
     public OperationAuthorizationException(String message) {
         super(message);
     }
-    
+
     /**
      * Constructor for OperationAuthorizationException
+     *
      * @param message description of why the exception was created
-     * @param cause the throwable that caused the exception to be created.
-     */    
+     * @param cause   the throwable that caused the exception to be created.
+     */
     public OperationAuthorizationException(String message, Throwable cause) {
         super(message, cause);
     }
diff --git a/bitrepository-core/src/main/java/org/bitrepository/protocol/security/exception/PermissionStoreException.java b/bitrepository-core/src/main/java/org/bitrepository/protocol/security/exception/PermissionStoreException.java
index 029a9a211..92a003db7 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/protocol/security/exception/PermissionStoreException.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/protocol/security/exception/PermissionStoreException.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -23,7 +23,7 @@
 
 
 /**
- * Execption class to indicate a problem with a call to permission store.  
+ * Execption class to indicate a problem with a call to permission store.
  */
 @SuppressWarnings("serial")
 public class PermissionStoreException extends Exception {
@@ -34,11 +34,12 @@ public class PermissionStoreException extends Exception {
     public PermissionStoreException(String message) {
         super(message);
     }
-    
+
     /**
      * Constructor for PermissionStoreException
+     *
      * @param message the message describing the reason for the exception
-     * @param e the exception that caused the creation of PermissionStoreException
+     * @param e       the exception that caused the creation of PermissionStoreException
      */
     public PermissionStoreException(String message, Throwable e) {
         super(message, e);
diff --git a/bitrepository-core/src/main/java/org/bitrepository/protocol/security/exception/SecurityException.java b/bitrepository-core/src/main/java/org/bitrepository/protocol/security/exception/SecurityException.java
index 2f5aac7e8..80d62b563 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/protocol/security/exception/SecurityException.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/protocol/security/exception/SecurityException.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -22,14 +22,14 @@
 package org.bitrepository.protocol.security.exception;
 
 /**
- * Exception to indicate a serious problem in the security package.  
+ * Exception to indicate a serious problem in the security package.
  */
 @SuppressWarnings("serial")
 public class SecurityException extends RuntimeException {
 
     /**
      * @param message the textual description of the cause.
-     * @param cause the reason for throwing the exception.
+     * @param cause   the reason for throwing the exception.
      */
     public SecurityException(String message, Throwable cause) {
         super(message, cause);
diff --git a/bitrepository-core/src/main/java/org/bitrepository/protocol/security/exception/UnregisteredPermissionException.java b/bitrepository-core/src/main/java/org/bitrepository/protocol/security/exception/UnregisteredPermissionException.java
index 30551f948..4657704da 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/protocol/security/exception/UnregisteredPermissionException.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/protocol/security/exception/UnregisteredPermissionException.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -22,7 +22,7 @@
 package org.bitrepository.protocol.security.exception;
 
 /**
- * Exception class to indicate that no permissions has been registered for the given operation type.  
+ * Exception class to indicate that no permissions has been registered for the given operation type.
  */
 @SuppressWarnings("serial")
 public class UnregisteredPermissionException extends Exception {
@@ -33,12 +33,13 @@ public class UnregisteredPermissionException extends Exception {
     public UnregisteredPermissionException(String message) {
         super(message);
     }
-    
+
     /**
      * Constructor for UnregisteredPermissionException
+     *
      * @param message description of why the exception was created
-     * @param cause the throwable that caused the exception to be created.
-     */    
+     * @param cause   the throwable that caused the exception to be created.
+     */
     public UnregisteredPermissionException(String message, Throwable cause) {
         super(message, cause);
     }
diff --git a/bitrepository-core/src/main/java/org/bitrepository/protocol/utils/LogbackConfigLoader.java b/bitrepository-core/src/main/java/org/bitrepository/protocol/utils/LogbackConfigLoader.java
index 8c0c32547..0ddf7a8c6 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/protocol/utils/LogbackConfigLoader.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/protocol/utils/LogbackConfigLoader.java
@@ -5,56 +5,55 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.protocol.utils;
 
-import java.io.File;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import ch.qos.logback.classic.LoggerContext;
 import ch.qos.logback.classic.joran.JoranConfigurator;
 import ch.qos.logback.core.joran.spi.JoranException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
 
 /**
  * Loads a Logback configurations.
  */
 public class LogbackConfigLoader {
-    /** The log.*/
-    private Logger log = LoggerFactory.getLogger(LogbackConfigLoader.class);
-    
+    private final Logger log = LoggerFactory.getLogger(LogbackConfigLoader.class);
+
     /**
      * Constructor.
+     *
      * @param configFileLocation The path to the configuration file.
      * @throws JoranException If the configuration cannot be loaded.
      */
-    public LogbackConfigLoader(String configFileLocation) throws JoranException{
+    public LogbackConfigLoader(String configFileLocation) throws JoranException {
         LoggerContext loggerContext = (LoggerContext) LoggerFactory.getILoggerFactory();
         File configFile = new File(configFileLocation);
-        if(!configFile.isFile()){
-            throw new IllegalArgumentException("Logback External Config File Parameter, " 
+        if (!configFile.isFile()) {
+            throw new IllegalArgumentException("Logback External Config File Parameter, "
                     + configFile.getAbsolutePath() + ", is not a file (either does not exists or is a directory).");
         }
-        
-        if(!configFile.canRead()){
+
+        if (!configFile.canRead()) {
             throw new IllegalArgumentException("Logback External Config File cannot be read from '"
                     + configFile.getAbsolutePath() + "'");
         }
-        
+
         JoranConfigurator configurator = new JoranConfigurator();
         configurator.setContext(loggerContext);
         loggerContext.reset();
diff --git a/bitrepository-core/src/main/java/org/bitrepository/protocol/utils/MessageCategoryUtils.java b/bitrepository-core/src/main/java/org/bitrepository/protocol/utils/MessageCategoryUtils.java
index bed3889cf..44cdcc30b 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/protocol/utils/MessageCategoryUtils.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/protocol/utils/MessageCategoryUtils.java
@@ -8,12 +8,12 @@
  * it under the terms of the GNU Lesser General Public License as
  * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
@@ -33,12 +33,8 @@ public static MessageCategory getCategory(Message message) {
 
     private static boolean isCategoryFast(Message message) {
         String messageType = message.getClass().getSimpleName();
-        if (messageType.contains("Identify") ||
-            messageType.contains("Progress") ||
-            message instanceof GetStatusRequest) {
-            return true;
-        } else {
-            return false;
-        }
+        return messageType.contains("Identify") ||
+                messageType.contains("Progress") ||
+                message instanceof GetStatusRequest;
     }
 }
diff --git a/bitrepository-core/src/main/java/org/bitrepository/protocol/utils/MessageDataTypeValidator.java b/bitrepository-core/src/main/java/org/bitrepository/protocol/utils/MessageDataTypeValidator.java
index d3a53338d..51940215d 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/protocol/utils/MessageDataTypeValidator.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/protocol/utils/MessageDataTypeValidator.java
@@ -4,10 +4,9 @@
 import org.bitrepository.bitrepositoryelements.ChecksumSpecTYPE;
 
 public final class MessageDataTypeValidator {
+    private MessageDataTypeValidator() {
+    }
 
-	/** Utility class, should never be instantiated */
-    private MessageDataTypeValidator() {}
-    
     /**
      * Check if a ChecksumDataForFileTYPE has the mandatory elements present.
      *
@@ -16,23 +15,23 @@ private MessageDataTypeValidator() {}
      * @throws IllegalArgumentException if validation fails
      */
     public static void validate(ChecksumDataForFileTYPE obj, String name) {
-    	if(obj != null) {
-    		if(obj.getChecksumValue() == null || obj.getChecksumValue().length < 1) {
-	            throw new IllegalArgumentException("The '" + name + "' is missing the checksum value.");
-	        }
-	    	
-	    	if(obj.getCalculationTimestamp() == null) {
-	    		throw new IllegalArgumentException("The '" + name + "' is missing the calculation timestamp.");
-	    	}
-	    	
-	    	if(obj.getChecksumSpec() == null) {
-	    		throw new IllegalArgumentException("The '" + name + "' is missing the checksum spec.");
-	    	}
-	    	
-	    	validate(obj.getChecksumSpec(), name);
-    	}
+        if (obj != null) {
+            if (obj.getChecksumValue() == null || obj.getChecksumValue().length < 1) {
+                throw new IllegalArgumentException("The '" + name + "' is missing the checksum value.");
+            }
+
+            if (obj.getCalculationTimestamp() == null) {
+                throw new IllegalArgumentException("The '" + name + "' is missing the calculation timestamp.");
+            }
+
+            if (obj.getChecksumSpec() == null) {
+                throw new IllegalArgumentException("The '" + name + "' is missing the checksum spec.");
+            }
+
+            validate(obj.getChecksumSpec(), name);
+        }
     }
-    
+
     /**
      * Check if a ChecksumSpecTYPE has the mandatory elements present.
      *
@@ -41,10 +40,10 @@ public static void validate(ChecksumDataForFileTYPE obj, String name) {
      * @throws IllegalArgumentException if validation fails
      */
     public static void validate(ChecksumSpecTYPE obj, String name) {
-    	if(obj != null) {
-    		if(obj.getChecksumType() == null) {
-    			throw new IllegalArgumentException("The '" + name + "' is missing the checksum type.");
-    		}
-    	}
+        if (obj != null) {
+            if (obj.getChecksumType() == null) {
+                throw new IllegalArgumentException("The '" + name + "' is missing the checksum type.");
+            }
+        }
     }
 }
diff --git a/bitrepository-core/src/main/java/org/bitrepository/protocol/utils/MessageUtils.java b/bitrepository-core/src/main/java/org/bitrepository/protocol/utils/MessageUtils.java
index 9f782011c..fdd432b9e 100644
--- a/bitrepository-core/src/main/java/org/bitrepository/protocol/utils/MessageUtils.java
+++ b/bitrepository-core/src/main/java/org/bitrepository/protocol/utils/MessageUtils.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -29,63 +29,65 @@
  * Utility class for validating message responses.
  */
 public class MessageUtils {
-    /** Private constructor to prevent instantiation of this utility class. */
-    private MessageUtils() {}
+    /**
+     * Private constructor to prevent instantiation of this utility class.
+     */
+    private MessageUtils() {
+    }
 
     /**
      * Validates whether a response message has a positive identification.
+     *
      * @param response The response message to validate.
      * @return Whether it is positive identified.
      */
-    public static boolean isPositiveIdentifyResponse (MessageResponse response) {
+    public static boolean isPositiveIdentifyResponse(MessageResponse response) {
         ResponseCode responseCode = response.getResponseInfo().getResponseCode();
         return responseCode.equals(ResponseCode.IDENTIFICATION_POSITIVE);
     }
 
     /**
      * Validates whether a response message has a positive progress response.
+     *
      * @param response The response message to validate.
      * @return Whether it is positive progress response.
      */
-    public static boolean isPositiveProgressResponse (MessageResponse response) {
+    public static boolean isPositiveProgressResponse(MessageResponse response) {
         ResponseCode responseCode = response.getResponseInfo().getResponseCode();
-        return responseCode.equals(ResponseCode.IDENTIFICATION_POSITIVE) ||
-               responseCode.equals(ResponseCode.OPERATION_ACCEPTED_PROGRESS) ||
-               responseCode.equals(ResponseCode.OPERATION_PROGRESS);
+        return responseCode.equals(ResponseCode.IDENTIFICATION_POSITIVE) || responseCode.equals(ResponseCode.OPERATION_ACCEPTED_PROGRESS) ||
+                responseCode.equals(ResponseCode.OPERATION_PROGRESS);
     }
-    
+
     /**
-     * Validates whether a response message has a identification response.
+     * Validates whether a response message has an identification response.
+     *
      * @param response The response message to validate.
      * @return Whether it is a identification response.
      */
-    public static boolean isIdentifyResponse (MessageResponse response) {
+    public static boolean isIdentifyResponse(MessageResponse response) {
         ResponseCode responseCode = response.getResponseInfo().getResponseCode();
-        return responseCode.equals(ResponseCode.IDENTIFICATION_POSITIVE) ||
-               responseCode.equals(ResponseCode.IDENTIFICATION_NEGATIVE);
+        return responseCode.equals(ResponseCode.IDENTIFICATION_POSITIVE) || responseCode.equals(ResponseCode.IDENTIFICATION_NEGATIVE);
     }
 
     /**
-     * Chechs whether the supplied message is a identify request
+     * Chechs whether the supplied message is an identify request
+     *
      * @param message The request message to check.
      * @return Whether it is a identification request.
      */
-    public static boolean isIdentifyRequest (Message message) {
+    public static boolean isIdentifyRequest(Message message) {
         String simpleName = message.getClass().getSimpleName();
         return simpleName.contains("Identify") && simpleName.contains("Request");
     }
 
     /**
-     * @return  whether the supplied message can be considered a end response for a primitive, eg. ends a serie of
-     * identify or operation responses.
      * @param response the supplied message
+     * @return whether the supplied message can be considered a end response for a primitive, emg. ends a series of
+     * identify or operation responses.
      */
     public static boolean isEndMessageForPrimitive(MessageResponse response) {
         ResponseCode responseCode = response.getResponseInfo().getResponseCode();
-        return  !(
-                responseCode.equals(ResponseCode.OPERATION_PROGRESS) ||
-                responseCode.equals(ResponseCode.OPERATION_ACCEPTED_PROGRESS)
-        );
+        return !(responseCode.equals(ResponseCode.OPERATION_PROGRESS) || responseCode.equals(ResponseCode.OPERATION_ACCEPTED_PROGRESS));
     }
 
     /**
@@ -94,13 +96,12 @@ public static boolean isEndMessageForPrimitive(MessageResponse response) {
      * @see #getShortConversationID(String)
      */
     public static String createMessageIdentifier(Message message) {
-        return message.getClass().getSimpleName() + "(" +
-            getShortConversationID(message.getCorrelationID())+ ")";
+        return message.getClass().getSimpleName() + "(" + getShortConversationID(message.getCorrelationID()) + ")";
     }
 
 
     /**
-     * @param fullConversationID The full conversation ID to create a shortend version for.
+     * @param fullConversationID The full conversation ID to create a short-end version for.
      * @return A shorted conversationID. Only the first part up til the first '-' is used
      * (but at least 4 long).
      */
diff --git a/bitrepository-core/src/test/java/org/bitrepository/common/ArgumentValidatorTest.java b/bitrepository-core/src/test/java/org/bitrepository/common/ArgumentValidatorTest.java
index 07284ed70..7606d7f03 100644
--- a/bitrepository-core/src/test/java/org/bitrepository/common/ArgumentValidatorTest.java
+++ b/bitrepository-core/src/test/java/org/bitrepository/common/ArgumentValidatorTest.java
@@ -21,14 +21,14 @@
  */
 package org.bitrepository.common;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashSet;
-
 import org.jaccept.structure.ExtendedTestCase;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+
 public class ArgumentValidatorTest extends ExtendedTestCase {
     @Test(groups = { "regressiontest" })
     public void utilityTester() throws Exception {
diff --git a/bitrepository-core/src/test/java/org/bitrepository/common/settings/SettingsLoaderTest.java b/bitrepository-core/src/test/java/org/bitrepository/common/settings/SettingsLoaderTest.java
index 7e022ebf1..d5c281788 100644
--- a/bitrepository-core/src/test/java/org/bitrepository/common/settings/SettingsLoaderTest.java
+++ b/bitrepository-core/src/test/java/org/bitrepository/common/settings/SettingsLoaderTest.java
@@ -24,13 +24,13 @@
  */
 package org.bitrepository.common.settings;
 
-import java.util.Arrays;
-import java.util.List;
-
 import org.jaccept.structure.ExtendedTestCase;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
+import java.util.Arrays;
+import java.util.List;
+
 public class SettingsLoaderTest extends ExtendedTestCase {
     private static final String PATH_TO_SETTINGS = "settings/xml/bitrepository-devel";
     private static final String PATH_TO_EXAMPLE_SETTINGS = "examples/settings";
diff --git a/bitrepository-core/src/test/java/org/bitrepository/common/settings/TestSettingsProvider.java b/bitrepository-core/src/test/java/org/bitrepository/common/settings/TestSettingsProvider.java
index c12a4821b..b2aa947bf 100644
--- a/bitrepository-core/src/test/java/org/bitrepository/common/settings/TestSettingsProvider.java
+++ b/bitrepository-core/src/test/java/org/bitrepository/common/settings/TestSettingsProvider.java
@@ -25,9 +25,10 @@
 package org.bitrepository.common.settings;
 
 
+import org.bitrepository.common.ArgumentValidator;
+
 import java.util.HashMap;
 import java.util.Map;
-import org.bitrepository.common.ArgumentValidator;
 
 /**
  * Helper class for easy access to the settings located in the <code>settings/xml</code> dir.
diff --git a/bitrepository-core/src/test/java/org/bitrepository/common/utils/Base16UtilsTest.java b/bitrepository-core/src/test/java/org/bitrepository/common/utils/Base16UtilsTest.java
index d2a8aa77a..4b4813f1f 100644
--- a/bitrepository-core/src/test/java/org/bitrepository/common/utils/Base16UtilsTest.java
+++ b/bitrepository-core/src/test/java/org/bitrepository/common/utils/Base16UtilsTest.java
@@ -22,7 +22,6 @@
 package org.bitrepository.common.utils;
 
 import org.bitrepository.common.TestValidationUtils;
-import org.bitrepository.common.utils.Base16Utils;
 import org.jaccept.structure.ExtendedTestCase;
 import org.testng.Assert;
 import org.testng.annotations.Test;
diff --git a/bitrepository-core/src/test/java/org/bitrepository/common/utils/CalendarUtilsTest.java b/bitrepository-core/src/test/java/org/bitrepository/common/utils/CalendarUtilsTest.java
index c5f3e94fd..3b459ef73 100644
--- a/bitrepository-core/src/test/java/org/bitrepository/common/utils/CalendarUtilsTest.java
+++ b/bitrepository-core/src/test/java/org/bitrepository/common/utils/CalendarUtilsTest.java
@@ -21,18 +21,17 @@
  */
 package org.bitrepository.common.utils;
 
+import org.jaccept.structure.ExtendedTestCase;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import javax.xml.datatype.XMLGregorianCalendar;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
 import java.util.TimeZone;
 
-import javax.xml.datatype.XMLGregorianCalendar;
-
-import org.jaccept.structure.ExtendedTestCase;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
 public class CalendarUtilsTest extends ExtendedTestCase {
     long DATE_IN_MILLIS = 123456789L;
     
diff --git a/bitrepository-core/src/test/java/org/bitrepository/common/utils/ChecksumUtilsTest.java b/bitrepository-core/src/test/java/org/bitrepository/common/utils/ChecksumUtilsTest.java
index a5467e229..134a36f55 100644
--- a/bitrepository-core/src/test/java/org/bitrepository/common/utils/ChecksumUtilsTest.java
+++ b/bitrepository-core/src/test/java/org/bitrepository/common/utils/ChecksumUtilsTest.java
@@ -24,12 +24,6 @@
  */
 package org.bitrepository.common.utils;
 
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-import java.security.NoSuchAlgorithmException;
-
 import org.bitrepository.bitrepositoryelements.ChecksumSpecTYPE;
 import org.bitrepository.bitrepositoryelements.ChecksumType;
 import org.bitrepository.common.TestValidationUtils;
@@ -39,6 +33,12 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.security.NoSuchAlgorithmException;
+
 public class ChecksumUtilsTest extends ExtendedTestCase {
     @Test(groups = { "regressiontest" })
     public void utilityTester() throws Exception {
diff --git a/bitrepository-core/src/test/java/org/bitrepository/common/utils/FileUtilsTest.java b/bitrepository-core/src/test/java/org/bitrepository/common/utils/FileUtilsTest.java
index e03006115..da5f7ad61 100644
--- a/bitrepository-core/src/test/java/org/bitrepository/common/utils/FileUtilsTest.java
+++ b/bitrepository-core/src/test/java/org/bitrepository/common/utils/FileUtilsTest.java
@@ -21,9 +21,6 @@
  */
 package org.bitrepository.common.utils;
 
-import java.io.File;
-import java.nio.charset.StandardCharsets;
-
 import org.apache.activemq.util.ByteArrayInputStream;
 import org.bitrepository.common.TestValidationUtils;
 import org.jaccept.structure.ExtendedTestCase;
@@ -32,6 +29,9 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import java.io.File;
+import java.nio.charset.StandardCharsets;
+
 public class FileUtilsTest extends ExtendedTestCase {
     String DIR = "test-directory";
     String SUB_DIR = "sub-directory";
diff --git a/bitrepository-core/src/test/java/org/bitrepository/common/utils/StreamUtilsTest.java b/bitrepository-core/src/test/java/org/bitrepository/common/utils/StreamUtilsTest.java
index a0a334790..2724e4d47 100644
--- a/bitrepository-core/src/test/java/org/bitrepository/common/utils/StreamUtilsTest.java
+++ b/bitrepository-core/src/test/java/org/bitrepository/common/utils/StreamUtilsTest.java
@@ -21,15 +21,15 @@
  */
 package org.bitrepository.common.utils;
 
-import java.io.ByteArrayOutputStream;
-import java.nio.charset.StandardCharsets;
-
 import org.apache.activemq.util.ByteArrayInputStream;
 import org.bitrepository.common.TestValidationUtils;
 import org.jaccept.structure.ExtendedTestCase;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
+import java.io.ByteArrayOutputStream;
+import java.nio.charset.StandardCharsets;
+
 public class StreamUtilsTest extends ExtendedTestCase {
     String DATA = "The data for the streams.";
     
diff --git a/bitrepository-core/src/test/java/org/bitrepository/common/utils/TestFileHelper.java b/bitrepository-core/src/test/java/org/bitrepository/common/utils/TestFileHelper.java
index 84940eeed..ca41c90cd 100644
--- a/bitrepository-core/src/test/java/org/bitrepository/common/utils/TestFileHelper.java
+++ b/bitrepository-core/src/test/java/org/bitrepository/common/utils/TestFileHelper.java
@@ -21,17 +21,17 @@
  */
 package org.bitrepository.common.utils;
 
+import org.bitrepository.bitrepositoryelements.ChecksumDataForFileTYPE;
+import org.bitrepository.bitrepositoryelements.ChecksumSpecTYPE;
+import org.bitrepository.bitrepositoryelements.ChecksumType;
+import org.bitrepository.protocol.message.ClientTestMessageFactory;
+
 import java.io.File;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-import org.bitrepository.bitrepositoryelements.ChecksumDataForFileTYPE;
-import org.bitrepository.bitrepositoryelements.ChecksumSpecTYPE;
-import org.bitrepository.bitrepositoryelements.ChecksumType;
-import org.bitrepository.protocol.message.ClientTestMessageFactory;
-
 public class TestFileHelper {
     public static final String DEFAULT_FILE_ID = ClientTestMessageFactory.FILE_ID_DEFAULT;
     public static final String TEST_RESOURCES_PATH = "test-files/";
diff --git a/bitrepository-core/src/test/java/org/bitrepository/common/utils/TimeMeasurementUtilsTest.java b/bitrepository-core/src/test/java/org/bitrepository/common/utils/TimeMeasurementUtilsTest.java
index defa493dc..ccfa0dd4c 100644
--- a/bitrepository-core/src/test/java/org/bitrepository/common/utils/TimeMeasurementUtilsTest.java
+++ b/bitrepository-core/src/test/java/org/bitrepository/common/utils/TimeMeasurementUtilsTest.java
@@ -24,16 +24,15 @@
  */
 package org.bitrepository.common.utils;
 
-import java.math.BigInteger;
-
 import org.bitrepository.bitrepositoryelements.TimeMeasureTYPE;
 import org.bitrepository.bitrepositoryelements.TimeMeasureUnit;
 import org.bitrepository.common.TestValidationUtils;
-import org.bitrepository.common.utils.TimeMeasurementUtils;
 import org.jaccept.structure.ExtendedTestCase;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
+import java.math.BigInteger;
+
 /**
  * Tests the <code>TimeMeasureComparator</code> class.
  */
@@ -100,7 +99,7 @@ public void testMaxValue() {
         Assert.assertEquals(time.getTimeMeasureValue().longValue(), Long.MAX_VALUE);
         Assert.assertEquals(time.getTimeMeasureUnit(), TimeMeasureUnit.HOURS);
         
-        TimeMeasureTYPE time2 = TimeMeasurementUtils.getTimeMeasurementFromMiliseconds(
+        TimeMeasureTYPE time2 = TimeMeasurementUtils.getTimeMeasurementFromMilliseconds(
                 BigInteger.valueOf(Long.MAX_VALUE));
         time2.setTimeMeasureUnit(TimeMeasureUnit.HOURS);
         Assert.assertEquals(TimeMeasurementUtils.compare(time, time2), 0);
diff --git a/bitrepository-core/src/test/java/org/bitrepository/protocol/IntegrationTest.java b/bitrepository-core/src/test/java/org/bitrepository/protocol/IntegrationTest.java
index bd34a6b92..533e8c43c 100644
--- a/bitrepository-core/src/test/java/org/bitrepository/protocol/IntegrationTest.java
+++ b/bitrepository-core/src/test/java/org/bitrepository/protocol/IntegrationTest.java
@@ -24,16 +24,8 @@
  */
 package org.bitrepository.protocol;
 
-import java.lang.reflect.Method;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Arrays;
-
-import javax.jms.JMSException;
-
 import ch.qos.logback.classic.LoggerContext;
 import ch.qos.logback.core.util.StatusPrinter;
-
 import org.bitrepository.common.settings.Settings;
 import org.bitrepository.common.settings.TestSettingsProvider;
 import org.bitrepository.common.utils.SettingsUtils;
@@ -59,6 +51,12 @@
 import org.testng.annotations.BeforeSuite;
 import org.testng.annotations.BeforeTest;
 
+import javax.jms.JMSException;
+import java.lang.reflect.Method;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Arrays;
+
 /**
  * Contains the generic parts for integration testing.
  */
diff --git a/bitrepository-core/src/test/java/org/bitrepository/protocol/MessageCreationTest.java b/bitrepository-core/src/test/java/org/bitrepository/protocol/MessageCreationTest.java
index 0362eda5b..fb97dcaf9 100644
--- a/bitrepository-core/src/test/java/org/bitrepository/protocol/MessageCreationTest.java
+++ b/bitrepository-core/src/test/java/org/bitrepository/protocol/MessageCreationTest.java
@@ -24,23 +24,10 @@
  */
 package org.bitrepository.protocol;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-import java.util.Iterator;
-
-import javax.xml.bind.JAXBException;
-import javax.xml.namespace.NamespaceContext;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.xpath.XPath;
-import javax.xml.xpath.XPathConstants;
-import javax.xml.xpath.XPathExpression;
-import javax.xml.xpath.XPathFactory;
-
 import org.apache.activemq.util.ByteArrayInputStream;
 import org.apache.commons.io.IOUtils;
-import org.bitrepository.bitrepositorymessages.GetChecksumsFinalResponse;
 import org.bitrepository.bitrepositorymessages.AlarmMessage;
+import org.bitrepository.bitrepositorymessages.GetChecksumsFinalResponse;
 import org.bitrepository.common.JaxbHelper;
 import org.bitrepository.protocol.message.ExampleMessageFactory;
 import org.jaccept.structure.ExtendedTestCase;
@@ -49,6 +36,18 @@
 import org.w3c.dom.NodeList;
 import org.xml.sax.SAXException;
 
+import javax.xml.bind.JAXBException;
+import javax.xml.namespace.NamespaceContext;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathExpression;
+import javax.xml.xpath.XPathFactory;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.Iterator;
+
 /**
  * Test whether we are able to create message objects from xml. The input XML is the example code defined in the
  * message-xml, thereby also testing whether this is valid. *
diff --git a/bitrepository-core/src/test/java/org/bitrepository/protocol/MessageReceiverManager.java b/bitrepository-core/src/test/java/org/bitrepository/protocol/MessageReceiverManager.java
index 543e7d4bc..e431414ba 100644
--- a/bitrepository-core/src/test/java/org/bitrepository/protocol/MessageReceiverManager.java
+++ b/bitrepository-core/src/test/java/org/bitrepository/protocol/MessageReceiverManager.java
@@ -21,11 +21,12 @@
  */
 package org.bitrepository.protocol;
 
-import java.util.LinkedList;
-import java.util.List;
 import org.bitrepository.protocol.bus.MessageReceiver;
 import org.bitrepository.protocol.messagebus.MessageBus;
 
+import java.util.LinkedList;
+import java.util.List;
+
 /**
  * Takes care of the receiver bookkeeping in connect with test setup and testdown.
  */
diff --git a/bitrepository-core/src/test/java/org/bitrepository/protocol/bus/MessageReceiver.java b/bitrepository-core/src/test/java/org/bitrepository/protocol/bus/MessageReceiver.java
index 2ec0c09b5..eaa47c503 100644
--- a/bitrepository-core/src/test/java/org/bitrepository/protocol/bus/MessageReceiver.java
+++ b/bitrepository-core/src/test/java/org/bitrepository/protocol/bus/MessageReceiver.java
@@ -24,14 +24,6 @@
  */
 package org.bitrepository.protocol.bus;
 
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.TimeUnit;
-import javax.jms.ExceptionListener;
-import javax.jms.JMSException;
 import org.bitrepository.bitrepositorymessages.Message;
 import org.bitrepository.protocol.MessageContext;
 import org.bitrepository.protocol.messagebus.MessageListener;
@@ -40,6 +32,15 @@
 import org.slf4j.LoggerFactory;
 import org.testng.Assert;
 
+import javax.jms.ExceptionListener;
+import javax.jms.JMSException;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
+
 /**
  * May be added as listener to the message queue where it will store all received messages for later reading. 
  * 
diff --git a/bitrepository-core/src/test/java/org/bitrepository/protocol/bus/MultiThreadedMessageBusTest.java b/bitrepository-core/src/test/java/org/bitrepository/protocol/bus/MultiThreadedMessageBusTest.java
index df35c496e..e731ab923 100644
--- a/bitrepository-core/src/test/java/org/bitrepository/protocol/bus/MultiThreadedMessageBusTest.java
+++ b/bitrepository-core/src/test/java/org/bitrepository/protocol/bus/MultiThreadedMessageBusTest.java
@@ -24,9 +24,6 @@
  */
 package org.bitrepository.protocol.bus;
 
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.TimeUnit;
 import org.bitrepository.bitrepositorymessages.IdentifyPillarsForGetFileRequest;
 import org.bitrepository.bitrepositorymessages.Message;
 import org.bitrepository.protocol.IntegrationTest;
@@ -38,6 +35,10 @@
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.Test;
 
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
+
 /**
  * Class for testing the interface with the message bus.
  */
diff --git a/bitrepository-core/src/test/java/org/bitrepository/protocol/bus/RawMessagebus.java b/bitrepository-core/src/test/java/org/bitrepository/protocol/bus/RawMessagebus.java
index 34fd20816..e6cf85378 100644
--- a/bitrepository-core/src/test/java/org/bitrepository/protocol/bus/RawMessagebus.java
+++ b/bitrepository-core/src/test/java/org/bitrepository/protocol/bus/RawMessagebus.java
@@ -22,8 +22,14 @@
 
 package org.bitrepository.protocol.bus;
 
-import java.util.HashMap;
-import java.util.Map;
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.bitrepository.common.JaxbHelper;
+import org.bitrepository.protocol.CoordinationLayerException;
+import org.bitrepository.protocol.activemq.ActiveMQMessageBus;
+import org.bitrepository.protocol.security.SecurityManager;
+import org.bitrepository.settings.repositorysettings.MessageBusConfiguration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.jms.Connection;
 import javax.jms.Destination;
@@ -34,15 +40,8 @@
 import javax.jms.MessageProducer;
 import javax.jms.Session;
 import javax.xml.bind.JAXBException;
-
-import org.apache.activemq.ActiveMQConnectionFactory;
-import org.bitrepository.common.JaxbHelper;
-import org.bitrepository.protocol.CoordinationLayerException;
-import org.bitrepository.protocol.activemq.ActiveMQMessageBus;
-import org.bitrepository.protocol.security.SecurityManager;
-import org.bitrepository.settings.repositorysettings.MessageBusConfiguration;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import java.util.HashMap;
+import java.util.Map;
 
 public class RawMessagebus {
     private final Logger log = LoggerFactory.getLogger(getClass());
diff --git a/bitrepository-core/src/test/java/org/bitrepository/protocol/fileexchange/HttpServerConnector.java b/bitrepository-core/src/test/java/org/bitrepository/protocol/fileexchange/HttpServerConnector.java
index 02124a8ea..52ac4ae17 100644
--- a/bitrepository-core/src/test/java/org/bitrepository/protocol/fileexchange/HttpServerConnector.java
+++ b/bitrepository-core/src/test/java/org/bitrepository/protocol/fileexchange/HttpServerConnector.java
@@ -24,19 +24,11 @@
  */
 package org.bitrepository.protocol.fileexchange;
 
+import org.jaccept.TestEventManager;
+
 import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URL;
-import org.apache.commons.io.FileUtils;
-import org.bitrepository.protocol.CoordinationLayerException;
-import org.jaccept.TestEventManager;
-import org.testng.Assert;
 
 /**
  * Test helper class for uploading and downloading files from a http server. 
diff --git a/bitrepository-core/src/test/java/org/bitrepository/protocol/fileexchange/LocalFileExchangeTest.java b/bitrepository-core/src/test/java/org/bitrepository/protocol/fileexchange/LocalFileExchangeTest.java
index f077eb54e..8521ee0b6 100644
--- a/bitrepository-core/src/test/java/org/bitrepository/protocol/fileexchange/LocalFileExchangeTest.java
+++ b/bitrepository-core/src/test/java/org/bitrepository/protocol/fileexchange/LocalFileExchangeTest.java
@@ -1,5 +1,14 @@
 package org.bitrepository.protocol.fileexchange;
 
+import org.apache.commons.codec.CharEncoding;
+import org.apache.commons.io.IOUtils;
+import org.bitrepository.protocol.FileExchange;
+import org.bitrepository.protocol.LocalFileExchange;
+import org.fusesource.hawtbuf.ByteArrayInputStream;
+import org.testng.Assert;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
@@ -14,15 +23,6 @@
 import java.nio.file.Files;
 import java.nio.file.Paths;
 
-import org.apache.commons.codec.CharEncoding;
-import org.apache.commons.io.IOUtils;
-import org.bitrepository.protocol.FileExchange;
-import org.bitrepository.protocol.LocalFileExchange;
-import org.fusesource.hawtbuf.ByteArrayInputStream;
-import org.testng.Assert;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
 public class LocalFileExchangeTest {
 
     final static String BASE_FILE_EXCHANGE_DIR = "target/fileexchange/";
diff --git a/bitrepository-core/src/test/java/org/bitrepository/protocol/fileexchange/TestFileStore.java b/bitrepository-core/src/test/java/org/bitrepository/protocol/fileexchange/TestFileStore.java
index 9fb5379b8..2955814f9 100644
--- a/bitrepository-core/src/test/java/org/bitrepository/protocol/fileexchange/TestFileStore.java
+++ b/bitrepository-core/src/test/java/org/bitrepository/protocol/fileexchange/TestFileStore.java
@@ -24,6 +24,12 @@
  */
 package org.bitrepository.protocol.fileexchange;
 
+import org.apache.commons.io.FileUtils;
+import org.bitrepository.common.filestore.DefaultFileInfo;
+import org.bitrepository.common.filestore.FileInfo;
+import org.bitrepository.common.filestore.FileStore;
+import org.bitrepository.protocol.message.ClientTestMessageFactory;
+
 import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -33,12 +39,6 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.apache.commons.io.FileUtils;
-import org.bitrepository.common.filestore.DefaultFileInfo;
-import org.bitrepository.common.filestore.FileInfo;
-import org.bitrepository.common.filestore.FileStore;
-import org.bitrepository.protocol.message.ClientTestMessageFactory;
-
 /** 
  * Models the storing and retrieval of files as needed in test modeling pillar behavior.
  * Even though it should support different collections, this implementation does not!
diff --git a/bitrepository-core/src/test/java/org/bitrepository/protocol/message/ClientTestMessageFactory.java b/bitrepository-core/src/test/java/org/bitrepository/protocol/message/ClientTestMessageFactory.java
index 4037f5b7e..fa25337ef 100644
--- a/bitrepository-core/src/test/java/org/bitrepository/protocol/message/ClientTestMessageFactory.java
+++ b/bitrepository-core/src/test/java/org/bitrepository/protocol/message/ClientTestMessageFactory.java
@@ -27,6 +27,7 @@
 import org.bitrepository.bitrepositoryelements.TimeMeasureUnit;
 import org.bitrepository.bitrepositorymessages.MessageRequest;
 import org.bitrepository.bitrepositorymessages.MessageResponse;
+
 import java.math.BigInteger;
 
 /**
diff --git a/bitrepository-core/src/test/java/org/bitrepository/protocol/message/ExampleMessageFactory.java b/bitrepository-core/src/test/java/org/bitrepository/protocol/message/ExampleMessageFactory.java
index 4886be1bd..31bc89a6e 100644
--- a/bitrepository-core/src/test/java/org/bitrepository/protocol/message/ExampleMessageFactory.java
+++ b/bitrepository-core/src/test/java/org/bitrepository/protocol/message/ExampleMessageFactory.java
@@ -24,13 +24,13 @@
  */
 package org.bitrepository.protocol.message;
 
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-
 import org.apache.activemq.util.ByteArrayInputStream;
 import org.apache.commons.io.IOUtils;
 import org.bitrepository.common.JaxbHelper;
 
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+
 /** Used to create message objects based on the example xml found in the message-xml module. */
 public class ExampleMessageFactory {
     //public static final String XML_MESSAGE_DIR = "target/";
diff --git a/bitrepository-core/src/test/java/org/bitrepository/protocol/messagebus/ReceivedMessageHandlerTest.java b/bitrepository-core/src/test/java/org/bitrepository/protocol/messagebus/ReceivedMessageHandlerTest.java
index e48fda61d..9aa28b5a0 100644
--- a/bitrepository-core/src/test/java/org/bitrepository/protocol/messagebus/ReceivedMessageHandlerTest.java
+++ b/bitrepository-core/src/test/java/org/bitrepository/protocol/messagebus/ReceivedMessageHandlerTest.java
@@ -21,9 +21,6 @@
  */
 package org.bitrepository.protocol.messagebus;
 
-import java.math.BigInteger;
-import java.util.Arrays;
-
 import org.bitrepository.bitrepositorymessages.GetStatusRequest;
 import org.bitrepository.bitrepositorymessages.Message;
 import org.bitrepository.bitrepositorymessages.PutFileRequest;
@@ -34,6 +31,9 @@
 import org.jaccept.structure.ExtendedTestCase;
 import org.testng.annotations.Test;
 
+import java.math.BigInteger;
+import java.util.Arrays;
+
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.timeout;
 import static org.mockito.Mockito.verify;
diff --git a/bitrepository-core/src/test/java/org/bitrepository/protocol/performancetest/MessageBusDelayTest.java b/bitrepository-core/src/test/java/org/bitrepository/protocol/performancetest/MessageBusDelayTest.java
index fbfc771cf..355328a8d 100644
--- a/bitrepository-core/src/test/java/org/bitrepository/protocol/performancetest/MessageBusDelayTest.java
+++ b/bitrepository-core/src/test/java/org/bitrepository/protocol/performancetest/MessageBusDelayTest.java
@@ -21,14 +21,6 @@
  */
 package org.bitrepository.protocol.performancetest;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
 import org.bitrepository.bitrepositorymessages.AlarmMessage;
 import org.bitrepository.common.settings.Settings;
 import org.bitrepository.common.settings.TestSettingsProvider;
@@ -43,6 +35,15 @@
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
+import java.io.File;
+import java.io.FileOutputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
 public class MessageBusDelayTest extends ExtendedTestCase {
     private Settings settings;
     /** The mocked SecurityManager */
diff --git a/bitrepository-core/src/test/java/org/bitrepository/protocol/performancetest/MessageBusNumberOfListenersStressTest.java b/bitrepository-core/src/test/java/org/bitrepository/protocol/performancetest/MessageBusNumberOfListenersStressTest.java
index fa8629a28..2f5a594ab 100644
--- a/bitrepository-core/src/test/java/org/bitrepository/protocol/performancetest/MessageBusNumberOfListenersStressTest.java
+++ b/bitrepository-core/src/test/java/org/bitrepository/protocol/performancetest/MessageBusNumberOfListenersStressTest.java
@@ -24,18 +24,13 @@
  */
 package org.bitrepository.protocol.performancetest;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
 import org.bitrepository.bitrepositorymessages.AlarmMessage;
 import org.bitrepository.bitrepositorymessages.Message;
 import org.bitrepository.common.settings.Settings;
 import org.bitrepository.common.settings.TestSettingsProvider;
 import org.bitrepository.protocol.MessageContext;
-import org.bitrepository.protocol.bus.LocalActiveMQBroker;
 import org.bitrepository.protocol.activemq.ActiveMQMessageBus;
+import org.bitrepository.protocol.bus.LocalActiveMQBroker;
 import org.bitrepository.protocol.bus.MessageBusConfigurationFactory;
 import org.bitrepository.protocol.message.ExampleMessageFactory;
 import org.bitrepository.protocol.messagebus.MessageBus;
@@ -48,6 +43,12 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import java.io.File;
+import java.io.FileOutputStream;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
 /**
  * Stress testing of the messagebus. 
  * 
diff --git a/bitrepository-core/src/test/java/org/bitrepository/protocol/performancetest/MessageBusNumberOfMessagesStressTest.java b/bitrepository-core/src/test/java/org/bitrepository/protocol/performancetest/MessageBusNumberOfMessagesStressTest.java
index fe08d9430..a21a482c3 100644
--- a/bitrepository-core/src/test/java/org/bitrepository/protocol/performancetest/MessageBusNumberOfMessagesStressTest.java
+++ b/bitrepository-core/src/test/java/org/bitrepository/protocol/performancetest/MessageBusNumberOfMessagesStressTest.java
@@ -24,8 +24,6 @@
  */
 package org.bitrepository.protocol.performancetest;
 
-import java.util.Date;
-
 import org.bitrepository.bitrepositorymessages.AlarmMessage;
 import org.bitrepository.bitrepositorymessages.Message;
 import org.bitrepository.common.settings.Settings;
@@ -44,6 +42,8 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import java.util.Date;
+
 /**
  * Stress testing of the messagebus. 
  */
diff --git a/bitrepository-core/src/test/java/org/bitrepository/protocol/performancetest/MessageBusSizeOfMessageStressTest.java b/bitrepository-core/src/test/java/org/bitrepository/protocol/performancetest/MessageBusSizeOfMessageStressTest.java
index 17fb53d1d..8ca722ab9 100644
--- a/bitrepository-core/src/test/java/org/bitrepository/protocol/performancetest/MessageBusSizeOfMessageStressTest.java
+++ b/bitrepository-core/src/test/java/org/bitrepository/protocol/performancetest/MessageBusSizeOfMessageStressTest.java
@@ -24,7 +24,6 @@
  */
 package org.bitrepository.protocol.performancetest;
 
-import java.util.Date;
 import org.bitrepository.bitrepositoryelements.Alarm;
 import org.bitrepository.bitrepositoryelements.AlarmCode;
 import org.bitrepository.bitrepositorymessages.AlarmMessage;
@@ -33,8 +32,8 @@
 import org.bitrepository.common.settings.TestSettingsProvider;
 import org.bitrepository.common.utils.CalendarUtils;
 import org.bitrepository.protocol.MessageContext;
-import org.bitrepository.protocol.bus.LocalActiveMQBroker;
 import org.bitrepository.protocol.activemq.ActiveMQMessageBus;
+import org.bitrepository.protocol.bus.LocalActiveMQBroker;
 import org.bitrepository.protocol.bus.MessageBusConfigurationFactory;
 import org.bitrepository.protocol.message.ExampleMessageFactory;
 import org.bitrepository.protocol.messagebus.MessageBus;
@@ -47,6 +46,8 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import java.util.Date;
+
 /**
  * Stress testing of the messagebus. 
  * 
diff --git a/bitrepository-core/src/test/java/org/bitrepository/protocol/performancetest/MessageBusTimeToSendMessagesStressTest.java b/bitrepository-core/src/test/java/org/bitrepository/protocol/performancetest/MessageBusTimeToSendMessagesStressTest.java
index 7a075151b..63eb13ae1 100644
--- a/bitrepository-core/src/test/java/org/bitrepository/protocol/performancetest/MessageBusTimeToSendMessagesStressTest.java
+++ b/bitrepository-core/src/test/java/org/bitrepository/protocol/performancetest/MessageBusTimeToSendMessagesStressTest.java
@@ -24,14 +24,13 @@
  */
 package org.bitrepository.protocol.performancetest;
 
-import java.util.Date;
 import org.bitrepository.bitrepositorymessages.AlarmMessage;
 import org.bitrepository.bitrepositorymessages.Message;
 import org.bitrepository.common.settings.Settings;
 import org.bitrepository.common.settings.TestSettingsProvider;
 import org.bitrepository.protocol.MessageContext;
-import org.bitrepository.protocol.bus.LocalActiveMQBroker;
 import org.bitrepository.protocol.activemq.ActiveMQMessageBus;
+import org.bitrepository.protocol.bus.LocalActiveMQBroker;
 import org.bitrepository.protocol.bus.MessageBusConfigurationFactory;
 import org.bitrepository.protocol.message.ExampleMessageFactory;
 import org.bitrepository.protocol.messagebus.MessageBus;
@@ -44,6 +43,8 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import java.util.Date;
+
 /**
  * Stress testing of the messagebus. 
  */
diff --git a/bitrepository-core/src/test/java/org/bitrepository/protocol/security/CertificateIDTest.java b/bitrepository-core/src/test/java/org/bitrepository/protocol/security/CertificateIDTest.java
index f230e1fb0..48d6b8390 100644
--- a/bitrepository-core/src/test/java/org/bitrepository/protocol/security/CertificateIDTest.java
+++ b/bitrepository-core/src/test/java/org/bitrepository/protocol/security/CertificateIDTest.java
@@ -21,14 +21,6 @@
  */
 package org.bitrepository.protocol.security;
 
-import java.io.ByteArrayInputStream;
-import java.math.BigInteger;
-import java.nio.charset.StandardCharsets;
-import java.security.Security;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509Certificate;
-
-import javax.security.auth.x500.X500Principal;
 import org.bouncycastle.cms.CMSProcessableByteArray;
 import org.bouncycastle.cms.CMSSignedData;
 import org.bouncycastle.cms.SignerInformation;
@@ -38,6 +30,14 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
+import javax.security.auth.x500.X500Principal;
+import java.io.ByteArrayInputStream;
+import java.math.BigInteger;
+import java.nio.charset.StandardCharsets;
+import java.security.Security;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
+
 public class CertificateIDTest extends ExtendedTestCase  {
         
     @Test(groups = {"regressiontest"})
diff --git a/bitrepository-core/src/test/java/org/bitrepository/protocol/security/PermissionStoreTest.java b/bitrepository-core/src/test/java/org/bitrepository/protocol/security/PermissionStoreTest.java
index b1a3d5e3e..8ab95f3dc 100644
--- a/bitrepository-core/src/test/java/org/bitrepository/protocol/security/PermissionStoreTest.java
+++ b/bitrepository-core/src/test/java/org/bitrepository/protocol/security/PermissionStoreTest.java
@@ -21,12 +21,6 @@
  */
 package org.bitrepository.protocol.security;
 
-import java.io.ByteArrayInputStream;
-import java.math.BigInteger;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509Certificate;
-import java.util.Locale;
-
 import org.bouncycastle.cms.CMSProcessableByteArray;
 import org.bouncycastle.cms.CMSSignedData;
 import org.bouncycastle.cms.SignerId;
@@ -36,6 +30,12 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import java.io.ByteArrayInputStream;
+import java.math.BigInteger;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
+import java.util.Locale;
+
 import static org.testng.Assert.assertEquals;
 
 public class PermissionStoreTest extends ExtendedTestCase  {
diff --git a/bitrepository-core/src/test/java/org/bitrepository/protocol/security/SecurityManagerTest.java b/bitrepository-core/src/test/java/org/bitrepository/protocol/security/SecurityManagerTest.java
index b6f6183e3..5b50b1511 100644
--- a/bitrepository-core/src/test/java/org/bitrepository/protocol/security/SecurityManagerTest.java
+++ b/bitrepository-core/src/test/java/org/bitrepository/protocol/security/SecurityManagerTest.java
@@ -21,10 +21,6 @@
  */
 package org.bitrepository.protocol.security;
 
-import java.io.UnsupportedEncodingException;
-import java.nio.charset.StandardCharsets;
-import java.util.List;
-
 import org.bitrepository.bitrepositorymessages.GetFileRequest;
 import org.bitrepository.bitrepositorymessages.PutFileRequest;
 import org.bitrepository.common.settings.Settings;
@@ -48,6 +44,10 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+
 public class SecurityManagerTest extends ExtendedTestCase  {
     private final Logger log = LoggerFactory.getLogger(getClass());
     private org.bitrepository.protocol.security.SecurityManager securityManager;
diff --git a/bitrepository-core/src/test/java/org/bitrepository/protocol/utils/ConfigLoaderTest.java b/bitrepository-core/src/test/java/org/bitrepository/protocol/utils/ConfigLoaderTest.java
index cd9a487ac..22b14c908 100644
--- a/bitrepository-core/src/test/java/org/bitrepository/protocol/utils/ConfigLoaderTest.java
+++ b/bitrepository-core/src/test/java/org/bitrepository/protocol/utils/ConfigLoaderTest.java
@@ -21,8 +21,6 @@
  */
 package org.bitrepository.protocol.utils;
 
-import java.io.File;
-
 import org.bitrepository.common.utils.FileUtils;
 import org.jaccept.structure.ExtendedTestCase;
 import org.testng.Assert;
@@ -30,6 +28,8 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import java.io.File;
+
 public class ConfigLoaderTest extends ExtendedTestCase {
     
     String GOOD_FILE_PATH = "logback-test.xml";
diff --git a/bitrepository-integration/src/license/THIRD-PARTY.properties b/bitrepository-integration/src/license/THIRD-PARTY.properties
index 50edfafe9..406acd9f5 100644
--- a/bitrepository-integration/src/license/THIRD-PARTY.properties
+++ b/bitrepository-integration/src/license/THIRD-PARTY.properties
@@ -1,6 +1,6 @@
 ###
 # #%L
-# Bitrepository Integration
+# BitRepository Integration
 # 
 # $Id$
 # $HeadURL$
diff --git a/bitrepository-integration/src/main/assembly/assembly.xml b/bitrepository-integration/src/main/assembly/assembly.xml
index d951de23c..e489a3012 100644
--- a/bitrepository-integration/src/main/assembly/assembly.xml
+++ b/bitrepository-integration/src/main/assembly/assembly.xml
@@ -1,6 +1,6 @@
 <!--
   #%L
-  Bitrepository Integration
+  BitRepository Integration
   %%
   Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
   %%
diff --git a/bitrepository-integration/src/main/assembly/tools-assembly.xml b/bitrepository-integration/src/main/assembly/tools-assembly.xml
index 1eb32229d..2db7d79e6 100644
--- a/bitrepository-integration/src/main/assembly/tools-assembly.xml
+++ b/bitrepository-integration/src/main/assembly/tools-assembly.xml
@@ -1,6 +1,6 @@
 <!--
   #%L
-  Bitrepository Reference Pillar
+  BitRepository Reference Pillar
   
   $Id$
   $HeadURL$
diff --git a/bitrepository-integration/src/main/resources/quickstart/scripts/quickstart.sh b/bitrepository-integration/src/main/resources/quickstart/scripts/quickstart.sh
index c0c6b468f..d918d482e 100644
--- a/bitrepository-integration/src/main/resources/quickstart/scripts/quickstart.sh
+++ b/bitrepository-integration/src/main/resources/quickstart/scripts/quickstart.sh
@@ -31,38 +31,38 @@ fi
 #Make sure we are in the scripts folder
 cd $(dirname $(perl -e "use Cwd 'abs_path';print abs_path('$0');"))
 #Go back to the quickstart "root dir"
-quickstartdir=$(pwd)
-export CATALINA_PID="${quickstartdir}/tomcat/pid.tomcat"
+quickstartDir=$(pwd)
+export CATALINA_PID="${quickstartDir}/tomcat/pid.tomcat"
 
 #
 # Function that starts the quickstart components
 #
 do_start() {
     export CATALINA_OPTS="-Xms256m -Xmx1028m"
-    ${quickstartdir}/file1pillar/bin/pillar.sh start
-    ${quickstartdir}/file2pillar/bin/pillar.sh start
-    ${quickstartdir}/checksumpillar/bin/pillar.sh start
-    ${quickstartdir}/tomcat/bin/catalina.sh start
+    ${quickstartDir}/file1pillar/bin/pillar.sh start
+    ${quickstartDir}/file2pillar/bin/pillar.sh start
+    ${quickstartDir}/checksumpillar/bin/pillar.sh start
+    ${quickstartDir}/tomcat/bin/catalina.sh start
 }
 
 #
 # Function that stops the quickstart components
 #
 do_stop() {
-    ${quickstartdir}/tomcat/bin/catalina.sh stop -force
-    ${quickstartdir}/file1pillar/bin/pillar.sh stop
-    ${quickstartdir}/file2pillar/bin/pillar.sh stop
-    ${quickstartdir}/checksumpillar/bin/pillar.sh stop
+    ${quickstartDir}/tomcat/bin/catalina.sh stop -force
+    ${quickstartDir}/file1pillar/bin/pillar.sh stop
+    ${quickstartDir}/file2pillar/bin/pillar.sh stop
+    ${quickstartDir}/checksumpillar/bin/pillar.sh stop
 }
 
 #
 # Function that lists the status of the quickstart components
 #
 do_status() {
-    ${quickstartdir}/file1pillar/bin/pillar.sh status
-    ${quickstartdir}/file2pillar/bin/pillar.sh status
-    ${quickstartdir}/checksumpillar/bin/pillar.sh status
-    ${quickstartdir}/tomcat/bin/catalina.sh status
+    ${quickstartDir}/file1pillar/bin/pillar.sh status
+    ${quickstartDir}/file2pillar/bin/pillar.sh status
+    ${quickstartDir}/checksumpillar/bin/pillar.sh status
+    ${quickstartDir}/tomcat/bin/catalina.sh status
 }
 
 case "$1" in
diff --git a/bitrepository-integration/src/main/resources/quickstart/scripts/setup.sh b/bitrepository-integration/src/main/resources/quickstart/scripts/setup.sh
index ae3ae7668..43c272924 100644
--- a/bitrepository-integration/src/main/resources/quickstart/scripts/setup.sh
+++ b/bitrepository-integration/src/main/resources/quickstart/scripts/setup.sh
@@ -31,12 +31,12 @@ fi
 #Make sure we are in the scripts folder
 cd $(dirname $(perl -e "use Cwd 'abs_path';print abs_path('$0');"))
 #Go back to the quickstart "root dir"
-quickstartdir=$(pwd)
+quickstartDir=$(pwd)
 
-#Find the configration directory
+#Find the configurations directory
 cd conf/
-configdir=$(pwd)
-cd $quickstartdir
+configDir=$(pwd)
+cd $quickstartDir
 
 #Make a directory for log files
 if [ ! -d "logs" ]; then 
@@ -57,7 +57,7 @@ fi
 if [ ! -d "file2pillar" ]; then
 	mkdir file2pillar
 fi
-cd $quickstartdir
+cd $quickstartDir
 
 #Setup configuration files, this includes:
 # - Create symlinks for RepositorySettings files in relevant configuration folders
@@ -70,68 +70,68 @@ do
           mkdir "reportdir"
         fi
         ln -sf ../RepositorySettings.xml .
-        sed -i'' -e s%\<\!--foobarpattern--\>%$quickstartdir/% ReferenceSettings.xml > /dev/null
-        sed -i'' -e s%\$\{user.home\}%$quickstartdir% logback.xml
-        cd $quickstartdir
+        sed -i'' -e s%\<\!--foobarpattern--\>%$quickstartDir/% ReferenceSettings.xml > /dev/null
+        sed -i'' -e s%\$\{user.home\}%$quickstartDir% logback.xml
+        cd $quickstartDir
 done
 
-sed -i'' -e s%eventsfile%$quickstartdir/logs/webclient-events% $configdir/webclient/webclient.properties
+sed -i'' -e s%eventsfile%$quickstartDir/logs/webclient-events% $configDir/webclient/webclient.properties
 
 for file in $(find tomcat-services -iname '*.xml')
 do
-	sed -i'' -e s%\${user.home}%$quickstartdir% $file
+	sed -i'' -e s%\${user.home}%$quickstartDir% $file
 done
 
 echo "Installing pillars"
-refpillartarfile=$(ls bitrepository-reference-pillar*.tar.gz)
-if [ ! -z $refpillartarfile ]; then
-	tar xf $refpillartarfile > /dev/null
-	rm $refpillartarfile
+refPillarTarFile=$(ls bitrepository-reference-pillar*.tar.gz)
+if [ ! -z $refPillarTarFile ]; then
+	tar xf $refPillarTarFile > /dev/null
+	rm $refPillarTarFile
 fi
 
-echo "Installing checksumpillar"
-refpillardistdir=$(ls -t | grep bitrepository-reference-pillar-.* | head -1)
+echo "Installing 'checksumpillar'"
+refPillarDistDir=$(ls -t | grep bitrepository-reference-pillar-.* | head -1)
 if [ ! -d "checksumpillar" ]; then 
 	mkdir "checksumpillar"
-	cp -r $refpillardistdir/lib checksumpillar/.
-	cp -r $refpillardistdir/bin checksumpillar/.
+	cp -r $refPillarDistDir/lib checksumpillar/.
+	cp -r $refPillarDistDir/bin checksumpillar/.
 	ln -s ../conf/checksumpillar checksumpillar/conf
 fi
 
-echo "Installing file1pillar"
+echo "Installing 'file1pillar'"
 if [ ! -d "file1pillar" ]; then
 	mkdir "file1pillar" 
-	cp -r $refpillardistdir/lib file1pillar/.
-	cp -r $refpillardistdir/bin file1pillar/.
+	cp -r $refPillarDistDir/lib file1pillar/.
+	cp -r $refPillarDistDir/bin file1pillar/.
 	ln -s ../conf/file1pillar file1pillar/conf
 fi
 
-echo "Installing file2pillar"
+echo "Installing 'file2pillar'"
 if [ ! -d "file2pillar" ]; then
         mkdir "file2pillar"
-        cp -r $refpillardistdir/lib file2pillar/.
-        cp -r $refpillardistdir/bin file2pillar/.
+        cp -r $refPillarDistDir/lib file2pillar/.
+        cp -r $refPillarDistDir/bin file2pillar/.
         ln -s ../conf/file2pillar file2pillar/conf
 fi
 
-rm -r $refpillardistdir
+rm -r $refPillarDistDir
 
-commandlinetarfile=$(ls bitrepository-client*.tar.gz)
-if [ ! -z $commandlinetarfile ]; then
-        tar xf $commandlinetarfile > /dev/null
-        rm $commandlinetarfile
+commandlineTarFile=$(ls bitrepository-client*.tar.gz)
+if [ ! -z $commandlineTarFile ]; then
+        tar xf $commandlineTarFile > /dev/null
+        rm $commandlineTarFile
 fi
 
-commandlinedistdir=$(ls -t | grep bitrepository-client* | head -1)
+commandlineDistDir=$(ls -t | grep bitrepository-client* | head -1)
 if [ ! -d "commandline" ]; then
-    mv $commandlinedistdir "commandline"
+    mv $commandlineDistDir "commandline"
     cd commandline
     rm -rf conf
     ln -s ../conf/commandline conf
     ln -s conf/logback.xml
 fi
 
-cd $quickstartdir
+cd $quickstartDir
 
 #Fetch, unpack, setup Apache Tomcat server
 echo "Installing tomcat"
@@ -150,13 +150,13 @@ if [ ! -d Catalina ]; then
         cd Catalina
         mkdir localhost
 fi
-cd $quickstartdir
+cd $quickstartDir
 
 for app in bitrepository-webclient.xml bitrepository-alarm-service.xml bitrepository-integrity-service.xml bitrepository-audit-trail-service.xml  bitrepository-monitoring-service.xml ; do
-	ln -sf $quickstartdir/tomcat-services/$app $quickstartdir/tomcat/conf/Catalina/localhost/$app
+	ln -sf $quickstartDir/tomcat-services/$app $quickstartDir/tomcat/conf/Catalina/localhost/$app
 done
 
-${quickstartdir}/quickstart.sh start
+${quickstartDir}/quickstart.sh start
 
 echo "Bit repository GUI can now be accessed at http://localhost:8080/bitrepository-webclient"
 
diff --git a/bitrepository-integration/src/main/scripts/startDerbyClient.sh b/bitrepository-integration/src/main/scripts/startDerbyClient.sh
index faecc9894..2629ea84d 100644
--- a/bitrepository-integration/src/main/scripts/startDerbyClient.sh
+++ b/bitrepository-integration/src/main/scripts/startDerbyClient.sh
@@ -2,7 +2,7 @@
 
 ###
 # #%L
-# Bitrepository Reference Pillar
+# BitRepository Reference Pillar
 # %%
 # Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
 # %%
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/IntegrityServiceManager.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/IntegrityServiceManager.java
index 8ec9afa5b..c401b14b0 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/IntegrityServiceManager.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/IntegrityServiceManager.java
@@ -8,31 +8,22 @@
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.integrityservice;
 
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Paths;
-import java.util.Properties;
-
 import org.bitrepository.access.AccessComponentFactory;
 import org.bitrepository.common.settings.Settings;
 import org.bitrepository.common.settings.XMLFileSettingsLoader;
@@ -57,13 +48,22 @@
 import org.bitrepository.service.audit.AuditTrailManager;
 import org.bitrepository.service.contributor.ContributorMediator;
 import org.bitrepository.service.contributor.SimpleContributorMediator;
-import org.bitrepository.service.scheduler.TimerbasedScheduler;
+import org.bitrepository.service.scheduler.TimerBasedScheduler;
 import org.bitrepository.service.workflow.WorkflowManager;
 import org.bitrepository.settings.referencesettings.AlarmLevel;
 import org.bitrepository.settings.referencesettings.ServiceType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Paths;
+import java.util.Properties;
+
 /**
  * Provides access to the different component in the integrity module.
  */
@@ -71,26 +71,26 @@ public final class IntegrityServiceManager {
     private static final Logger log = LoggerFactory.getLogger(IntegrityServiceManager.class);
     private static String privateKeyFile;
     private static File integrityReportStorageDir;
-
-    /** The properties file holding implementation specifics for the integrity service. */
-    private static final String CONFIGFILE = "integrity.properties";
-    /** Property key to tell where to locate the path and filename to the private key file. */
+    /**
+     * The properties file holding implementation specifics for the integrity service.
+     */
+    private static final String CONFIG_FILE = "integrity.properties";
+    /**
+     * Property key to tell where to locate the path and filename to the private key file.
+     */
     private static final String PRIVATE_KEY_FILE = "org.bitrepository.integrity-service.privateKeyFile";
     private static Settings settings;
-    private static SecurityManager securityManager;
     private static IntegrityWorkflowManager workFlowManager;
     private static String confDir;
     private static IntegrityLifeCycleHandler lifeCycleHandler;
     private static IntegrityModel model;
     private static ContributorMediator contributor;
     private static MessageBus messageBus;
-    private static IntegrityInformationCollector collector;
-    private static AuditTrailManager auditManager;
-    private static IntegrityAlerter alarmDispatcher;
     private static IntegrityReportProvider integrityReportProvider;
 
     /**
      * Returns the single instance of the intergity service.
+     *
      * @return A new integrity service instance.
      */
     public static LifeCycledService getIntegrityLifeCycleHandler() {
@@ -103,47 +103,49 @@ public static LifeCycledService getIntegrityLifeCycleHandler() {
     /**
      * Initializes the integrity service
      * Should only be run at initialization time.
+     *
      * @param configurationDir the configuration dir
      */
     public static synchronized void initialize(String configurationDir) {
         confDir = configurationDir;
         loadSettings();
         String id = settings.getReferenceSettings().getIntegrityServiceSettings().getID();
-        securityManager = SecurityManagerUtil.getSecurityManager(settings, Paths.get(privateKeyFile), id); 
-                
+        SecurityManager securityManager = SecurityManagerUtil.getSecurityManager(settings, Paths.get(privateKeyFile), id);
+
         messageBus = ProtocolComponentFactory.getInstance().getMessageBus(settings, securityManager);
-        
+
         AuditTrailContributerDAOFactory daoFactory = new AuditTrailContributerDAOFactory();
-        auditManager = daoFactory.getAuditTrailContributorDAO(
+        AuditTrailManager auditManager = daoFactory.getAuditTrailContributorDAO(
                 settings.getReferenceSettings().getIntegrityServiceSettings().getAuditTrailContributerDatabase(),
                 settings.getComponentID());
-                
-        alarmDispatcher = new IntegrityAlarmDispatcher(settings, messageBus, AlarmLevel.ERROR);
+
+        IntegrityAlerter alarmDispatcher = new IntegrityAlarmDispatcher(settings, messageBus, AlarmLevel.ERROR);
         model = new IntegrityDatabase(settings);
 
         AccessComponentFactory acf = AccessComponentFactory.getInstance();
         ModifyComponentFactory mcf = ModifyComponentFactory.getInstance();
-        
-        collector = new DelegatingIntegrityInformationCollector(
+
+        IntegrityInformationCollector collector = new DelegatingIntegrityInformationCollector(
                 acf.createGetFileIDsClient(settings, securityManager, id),
                 acf.createGetChecksumsClient(settings, securityManager, id),
                 acf.createGetFileClient(settings, securityManager, id),
                 mcf.retrievePutClient(settings, securityManager, id));
         integrityReportProvider = new IntegrityReportProvider(integrityReportStorageDir);
-        
+
         workFlowManager = new IntegrityWorkflowManager(
                 new IntegrityWorkflowContext(settings, collector, model, alarmDispatcher, auditManager),
-                new TimerbasedScheduler());
+                new TimerBasedScheduler());
         contributor = new SimpleContributorMediator(messageBus, settings, auditManager, null);
         contributor.start();
     }
 
     /**
      * Retrieves the shared settings based on the directory specified in the {@link #initialize(String)} method.
+     *
      * @return The settings to used for the integrity service.
      */
     private static void loadSettings() {
-        if(confDir == null) {
+        if (confDir == null) {
             throw new IllegalStateException("No configuration directory has been set!");
         }
         loadProperties();
@@ -153,12 +155,12 @@ private static void loadSettings() {
         SettingsUtils.initialize(settings);
         integrityReportStorageDir = new File(
                 settings.getReferenceSettings().getIntegrityServiceSettings().getIntegrityReportsDir());
-        if(!(integrityReportStorageDir.isDirectory() 
-                && integrityReportStorageDir.canRead() 
+        if (!(integrityReportStorageDir.isDirectory()
+                && integrityReportStorageDir.canRead()
                 && integrityReportStorageDir.canWrite())) {
-            throw new IllegalStateException(integrityReportStorageDir.getAbsolutePath() 
+            throw new IllegalStateException(integrityReportStorageDir.getAbsolutePath()
                     + " is either not a directory, can't be read or written to.");
-        }        
+        }
     }
 
     /**
@@ -167,16 +169,11 @@ private static void loadSettings() {
     private static void loadProperties() {
         try {
             Properties properties = new Properties();
-            String propertiesFile = confDir + "/" + CONFIGFILE;
-            BufferedReader propertiesReader = null;
-            try {
-                propertiesReader = new BufferedReader(new InputStreamReader(new FileInputStream(propertiesFile), StandardCharsets.UTF_8));
+            String propertiesFile = confDir + "/" + CONFIG_FILE;
+            try (BufferedReader propertiesReader = new BufferedReader(
+                    new InputStreamReader(new FileInputStream(propertiesFile), StandardCharsets.UTF_8))) {
                 properties.load(propertiesReader);
                 privateKeyFile = properties.getProperty(PRIVATE_KEY_FILE);
-            } finally {
-                if(propertiesReader != null) {
-                    propertiesReader.close();
-                }
             }
         } catch (IOException e) {
             throw new IllegalStateException("Could not instantiate the properties.", e);
@@ -185,14 +182,15 @@ private static void loadProperties() {
 
     /**
      * Gets you the <code>IntegrityModel</code> that contains the data needed to perform integrity operations.
+     *
      * @return the <code>IntegrityModel</code> that contains integrity information.
      */
     public static IntegrityModel getIntegrityModel() {
         return model;
     }
-    
+
     /**
-     *  @return Gets the directory for integrity report storage.
+     * @return Gets the directory for integrity report storage.
      */
     public static File getIntegrityReportStorageDir() {
         return integrityReportStorageDir;
@@ -201,7 +199,7 @@ public static File getIntegrityReportStorageDir() {
     public static IntegrityReportProvider getIntegrityReportProvider() {
         return integrityReportProvider;
     }
-    
+
     /**
      * @return Gets you the <code>WorkflowManager</code> exposing the workflow model.
      */
@@ -211,22 +209,23 @@ public static WorkflowManager getWorkflowManager() {
 
     public static class IntegrityLifeCycleHandler implements LifeCycledService {
         @Override
-        public void start() {}
+        public void start() {
+        }
 
         @Override
         public void shutdown() {
-            if(messageBus != null) {
+            if (messageBus != null) {
                 try {
                     messageBus.close();
                 } catch (Exception e) {
-                    log.warn("Encountered issues when closing down the messagebus.", e);
+                    log.warn("Encountered issues when closing down the message-bus.", e);
                 }
             }
-            if(contributor != null) {
+            if (contributor != null) {
                 contributor.close();
             }
 
-            if(model != null) {
+            if (model != null) {
                 model.close();
             }
         }
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/alerter/IntegrityAlarmDispatcher.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/alerter/IntegrityAlarmDispatcher.java
index 30b567f19..7c1467b55 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/alerter/IntegrityAlarmDispatcher.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/alerter/IntegrityAlarmDispatcher.java
@@ -1,23 +1,24 @@
 /*
  * #%L
  * Bitrepository Integration
- * 
+ *
  * $Id: AlarmDispatcher.java 627 2011-12-09 15:13:13Z jolf $
- * $HeadURL: https://sbforge.org/svn/bitrepository/bitrepository-reference/trunk/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/AlarmDispatcher.java $
+ * $HeadURL: https://sbforge.org/svn/bitrepository/bitrepository-reference/trunk/bitrepository-reference-pillar/src/main/java/org
+ * /bitrepository/pillar/messagehandler/AlarmDispatcher.java $
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -38,8 +39,9 @@ public class IntegrityAlarmDispatcher extends AlarmDispatcher implements Integri
 
     /**
      * Delegates to the AlarmDispatcher dispatcher.
-     * @param settings The settings to use.
-     * @param sender Used for sending the alarms.
+     *
+     * @param settings   The settings to use.
+     * @param sender     Used for sending the alarms.
      * @param alarmLevel Only send alarms at this alarms level or higher.
      */
     public IntegrityAlarmDispatcher(Settings settings, MessageSender sender, AlarmLevel alarmLevel) {
@@ -61,9 +63,9 @@ public void integrityFailed(String summary, String collectionID) {
         ad.setAlarmCode(AlarmCode.INTEGRITY_ISSUE);
         ad.setAlarmText(summary);
         ad.setCollectionID(collectionID);
-        error(ad);        
+        error(ad);
     }
-    
+
     @Override
     public void integrityComponentFailure(String summary, String collectionID) {
         Alarm ad = new Alarm();
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/alerter/IntegrityAlerter.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/alerter/IntegrityAlerter.java
index 806432b7b..27371d043 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/alerter/IntegrityAlerter.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/alerter/IntegrityAlerter.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -24,24 +24,27 @@
 /**
  * The integrity alerter, for creating alarms based on an integrity report.
  */
-public interface IntegrityAlerter { 
+public interface IntegrityAlerter {
     /**
      * Sends an alarm based on an integrity reporter.
+     *
      * @param summary A textual summary of the integrity issues.
      */
     void integrityFailed(String summary, String collectionID);
-    
+
     /**
      * Send an alarm based on an exception.
-     * @param issue The reason for the exception.
+     *
+     * @param issue        The reason for the exception.
      * @param collectionID The ID of the collection that the alarm belongs to, may be null
      */
     void operationFailed(String issue, String collectionID);
-    
+
     /**
      * Send an alarm due to a failure in the service
-     * @param summary The description of the failure
-     * @param collectionID The collection which the failure regards 
+     *
+     * @param summary      The description of the failure
+     * @param collectionID The collection which the failure regards
      */
-    void integrityComponentFailure(String summary, String collectionID); 
+    void integrityComponentFailure(String summary, String collectionID);
 }
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/audittrail/IntegrityAuditTrailDatabaseCreator.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/audittrail/IntegrityAuditTrailDatabaseCreator.java
index 2e1637ebd..cb41f11ab 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/audittrail/IntegrityAuditTrailDatabaseCreator.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/audittrail/IntegrityAuditTrailDatabaseCreator.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -31,11 +31,11 @@ public class IntegrityAuditTrailDatabaseCreator extends DatabaseCreator {
 
     /**
      * @param args <ol>
-     * <li> The path to the directory containing the settings. See
-     * {@link org.bitrepository.common.settings.XMLFileSettingsLoader} for details.</li>
-     * <li> The database creation script as found in the classpath. Will revert to  DEFAULT_CHECKSUM_DB_SCRIPT =
-     * "sql/derby/checksumDBCreation.sql" if null.</li>
-     * </ol>
+     *             <li> The path to the directory containing the settings. See
+     *             {@link org.bitrepository.common.settings.XMLFileSettingsLoader} for details.</li>
+     *             <li> The database creation script as found in the classpath. Will revert to  DEFAULT_CHECKSUM_DB_SCRIPT =
+     *             "sql/derby/checksumDBCreation.sql" if null.</li>
+     *             </ol>
      */
     public static void main(String[] args) {
         IntegrityAuditTrailDatabaseCreator dbCreatorPillar = new IntegrityAuditTrailDatabaseCreator();
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/CollectionStat.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/CollectionStat.java
index fb57af228..a956699e9 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/CollectionStat.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/CollectionStat.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2013 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -30,15 +30,14 @@ public class CollectionStat {
     private Long checksumErrors;
     private Date latestFileTime;
     private Date statsTime;
-    /** The date that the statistics were updated */
     private Date updateTime;
-    
+
     public CollectionStat(String collectionID) {
         this.collectionID = collectionID;
     }
-    
-    public CollectionStat(String collectionID, Long fileCount, Long dataSize, Long checksumErrors, 
-            Date latestFile, Date statsTime, Date updateTime) {
+
+    public CollectionStat(String collectionID, Long fileCount, Long dataSize, Long checksumErrors,
+                          Date latestFile, Date statsTime, Date updateTime) {
         this.collectionID = collectionID;
         this.fileCount = fileCount;
         this.dataSize = dataSize;
@@ -48,28 +47,26 @@ public CollectionStat(String collectionID, Long fileCount, Long dataSize, Long c
         this.updateTime = updateTime;
     }
 
-
-    /** @return The ID of the collection */
     public String getCollectionID() {
         return collectionID;
     }
-    /** @return The number of files in the collection */
+
     public Long getFileCount() {
         return fileCount;
     }
-    /** @return The size of the collection */
+
     public Long getDataSize() {
         return dataSize;
     }
-    /** @return The number of checksum errors */
+
     public Long getChecksumErrors() {
         return checksumErrors;
     }
-    /** @return The date that the statistics were collected */
+
     public Date getStatsTime() {
         return statsTime;
     }
-    /** @return The date that the statistics were updated */
+
     public Date getUpdateTime() {
         return updateTime;
     }
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/FileInfo.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/FileInfo.java
index 4c77b6bd9..1978f3912 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/FileInfo.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/FileInfo.java
@@ -1,68 +1,58 @@
 /*
  * #%L
  * Bitrepository Integrity Client
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.integrityservice.cache;
 
-import java.util.Date;
-
-import javax.xml.datatype.XMLGregorianCalendar;
-
 import org.bitrepository.common.ArgumentValidator;
 import org.bitrepository.common.utils.CalendarUtils;
 
+import javax.xml.datatype.XMLGregorianCalendar;
+import java.util.Date;
+
 /**
  * Class for containing the information about a given file at a given pillar.
  */
 public class FileInfo {
-    /** The id of the file.*/
     private final String fileID;
-    /** The date for the last check for the file ID.*/
     private XMLGregorianCalendar fileCreationTimestamp;
-    /** The checksum of the file.*/
     private String checksum;
-    /** The date for the last check of the checksum.*/
     private XMLGregorianCalendar checksumLastCheck;
-    /** The id of the pillar.*/
     private final String pillarID;
-    /** The size of the file */
-    private Long fileSize;
-    /** The last time the files was seen by getFileIDs */
+    private final Long fileSize;
     private Date lastSeenGetFileIDs;
-    /** The last time the files was seen by getChecksums */
     private Date lastSeenGetChecksums;
-    
+
     /**
-     * Constructor for all data.
-     * @param fileID The id of the file (may not be null)
-     * @param fileLastCheck The date for the last check of the file id (if null, replaced by Epoch).
-     * @param checksum The checksum of the file.
-     * @param fileSize The size for the file, in Bytes
+     * @param fileID            The id of the file (may not be null)
+     * @param fileLastCheck     The date for the last check of the file id (if null, replaced by Epoch).
+     * @param checksum          The checksum of the file.
+     * @param fileSize          The size for the file, in Bytes
      * @param checksumLastCheck The date for the last check of the checksum (if null, replaced by Epoch).
-     * @param pillarID The id of the pillar (may not be null)
+     * @param pillarID          The id of the pillar (may not be null)
      */
     public FileInfo(String fileID, XMLGregorianCalendar fileLastCheck, String checksum, Long fileSize,
-            XMLGregorianCalendar checksumLastCheck, String pillarID) {
+                    XMLGregorianCalendar checksumLastCheck, String pillarID) {
         ArgumentValidator.checkNotNullOrEmpty(fileID, "String fileID");
         ArgumentValidator.checkNotNullOrEmpty(pillarID, "String pillarID");
         this.fileID = fileID;
@@ -71,95 +61,69 @@ public FileInfo(String fileID, XMLGregorianCalendar fileLastCheck, String checks
         this.fileSize = fileSize;
         this.checksumLastCheck = checksumLastCheck;
         this.pillarID = pillarID;
-        
+
         // If file id date is null, then replace with epoch.
-        if(fileLastCheck == null) {
+        if (fileLastCheck == null) {
             this.fileCreationTimestamp = CalendarUtils.getEpoch();
         }
-        
+
         // If checksum date is null, then replace with epoch.
-        if(checksumLastCheck == null) {
+        if (checksumLastCheck == null) {
             this.checksumLastCheck = CalendarUtils.getEpoch();
         }
     }
-    
+
     /**
      * Constructor for only file id and pillar id.
-     * @param fileID The id of the file.
+     *
+     * @param fileID   The id of the file.
      * @param pillarID The id of the pillar.
      */
     public FileInfo(String fileID, String pillarID) {
         this(fileID, null, null, null, null, pillarID);
     }
-    
-    /**
-     * @return The id of the file.
-     */
+
     public String getFileId() {
         return fileID;
     }
-    
-    /**
-     * @return The date for the last check of the file. 
-     */
+
     public XMLGregorianCalendar getDateForLastFileIDCheck() {
         return fileCreationTimestamp;
     }
-    
-    /**
-     * @param dateForLastFileIDCheck The new date for the last check of the file.
-     */
+
     public void setDateForLastFileIDCheck(XMLGregorianCalendar dateForLastFileIDCheck) {
         this.fileCreationTimestamp = dateForLastFileIDCheck;
     }
-    
-    /**
-     * @return Checksum of the file. This can be null, if the checksum has not been retrieved yet.
-     */
+
     public String getChecksum() {
         return checksum;
     }
-    
-    /**
-     * @param checksum The new checksum.
-     */
+
     public void setChecksum(String checksum) {
         this.checksum = checksum;
     }
-    
-    /**
-     * @return The date for the last check of the checksum.
-     */
+
     public XMLGregorianCalendar getDateForLastChecksumCheck() {
         return checksumLastCheck;
     }
-    
-    /**
-     * @param dateForLastChecksumCheck The new date for the last checksum of the checksum.
-     */
+
     public void setDateForLastChecksumCheck(XMLGregorianCalendar dateForLastChecksumCheck) {
         this.checksumLastCheck = dateForLastChecksumCheck;
     }
-    
-    /**
-     * @return The id of the pillar.
-     */
+
     public String getPillarId() {
         return pillarID;
     }
-    
-    /**
-     * @return The size of the file
-     */
+
     public Long getFileSize() {
         return fileSize;
     }
-    
+
     @Override
     public String toString() {
         return "Pillar id: " + pillarID + ", File id: " + fileID + " (date: "
-                + fileCreationTimestamp + "), Checksum: " + checksum + " (date: " 
-                + checksumLastCheck + ", lastSeenGetFileIDs: " + lastSeenGetFileIDs 
+                + fileCreationTimestamp + "), Checksum: " + checksum + " (date: "
+                + checksumLastCheck + ", lastSeenGetFileIDs: " + lastSeenGetFileIDs
                 + ", lastSeenGetChecksums: " + lastSeenGetChecksums + ")";
     }
 
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/IntegrityDatabase.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/IntegrityDatabase.java
index a438836a2..99e3749ea 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/IntegrityDatabase.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/IntegrityDatabase.java
@@ -5,27 +5,22 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.integrityservice.cache;
 
-import java.util.Collection;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
 import org.bitrepository.bitrepositoryelements.ChecksumDataForChecksumSpecTYPE;
 import org.bitrepository.bitrepositoryelements.FileIDsData;
 import org.bitrepository.common.settings.Settings;
@@ -36,8 +31,13 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
 public class IntegrityDatabase implements IntegrityModel {
-    private Logger log = LoggerFactory.getLogger(this.getClass());
+    private final Logger log = LoggerFactory.getLogger(this.getClass());
 
     private final IntegrityDAO store;
 
@@ -61,12 +61,12 @@ public void addChecksums(List<ChecksumDataForChecksumSpecTYPE> data, String pill
     public Collection<FileInfo> getFileInfos(String fileID, String collectionID) {
         return store.getFileInfosForFile(fileID, collectionID);
     }
-    
+
     @Override
     public void resetFileCollectionProgress(String collectionID) {
         store.resetFileCollectionProgress(collectionID);
     }
-    
+
     @Override
     public void resetChecksumCollectionProgress(String collectionID) {
         store.resetChecksumCollectionProgress(collectionID);
@@ -79,21 +79,21 @@ public long getNumberOfFilesInCollection(String collectionID) {
 
     @Override
     public IntegrityIssueIterator getFilesOnPillar(String pillarID, long firstIndex,
-            long maxResults, String collectionID) {
+                                                   long maxResults, String collectionID) {
         return store.getAllFileIDsOnPillar(collectionID, pillarID, firstIndex, maxResults);
     }
-    
-    @Override 
-    public IntegrityIssueIterator findFilesWithMissingCopies(String collectionID, int expectedCopies, 
-            Long firstIndex, Long maxResults) {
+
+    @Override
+    public IntegrityIssueIterator findFilesWithMissingCopies(String collectionID, int expectedCopies,
+                                                             Long firstIndex, Long maxResults) {
         return store.findFilesWithMissingCopies(collectionID, expectedCopies, firstIndex, maxResults);
     }
-    
+
     @Override
     public void deleteFileIdEntry(String collectionID, String pillarID, String fileID) {
         store.removeFile(collectionID, pillarID, fileID);
     }
-    
+
     @Override
     public IntegrityIssueIterator findFilesWithMissingChecksum(String collectionID, String pillarID, Date cutoffDate) {
         return store.getFilesWithMissingChecksums(collectionID, pillarID, cutoffDate);
@@ -103,7 +103,7 @@ public IntegrityIssueIterator findFilesWithMissingChecksum(String collectionID,
     public IntegrityIssueIterator findChecksumsOlderThan(Date date, String pillarID, String collectionID) {
         return store.getFilesWithOutdatedChecksums(collectionID, pillarID, date);
     }
-    
+
     @Override
     public IntegrityIssueIterator findOrphanFiles(String collectionID, String pillarID, Date cutoffDate) {
         return store.getOrphanFilesOnPillar(collectionID, pillarID, cutoffDate);
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/IntegrityDatabaseManager.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/IntegrityDatabaseManager.java
index b873f7bde..e98d22e15 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/IntegrityDatabaseManager.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/IntegrityDatabaseManager.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -26,18 +26,17 @@
 import org.bitrepository.settings.referencesettings.DatabaseSpecifics;
 
 /**
- * Manager for the database of the IntegrityService. For usage, see @DatabaseManager. 
+ * Manager for the database of the IntegrityService. For usage, see @DatabaseManager.
  */
 public class IntegrityDatabaseManager extends DatabaseManager {
-
     private static final String INTEGRITY_SERVICE_DATABASE_SCHEMA = "sql/derby/integrityDBCreation.sql";
     private final DatabaseSpecifics databaseSpecifics;
     private DatabaseMigrator migrator = null;
-        
+
     public IntegrityDatabaseManager(DatabaseSpecifics databaseSpecifics) {
         this.databaseSpecifics = databaseSpecifics;
     }
-    
+
     @Override
     protected DatabaseSpecifics getDatabaseSpecifics() {
         return databaseSpecifics;
@@ -45,7 +44,7 @@ protected DatabaseSpecifics getDatabaseSpecifics() {
 
     @Override
     protected synchronized DatabaseMigrator getMigrator() {
-        if(migrator == null) {
+        if (migrator == null) {
             migrator = new IntegrityDatabaseMigrator(connector);
         }
         return migrator;
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/IntegrityDatabaseMigrator.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/IntegrityDatabaseMigrator.java
index 2ab5d9633..f93b36edb 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/IntegrityDatabaseMigrator.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/IntegrityDatabaseMigrator.java
@@ -5,99 +5,112 @@
  * Copyright (C) 2010 - 2013 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.integrityservice.cache;
 
-import java.util.Map;
-
 import org.bitrepository.service.database.DBConnector;
 import org.bitrepository.service.database.DatabaseMigrator;
 import org.bitrepository.service.database.DatabaseUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Map;
+
 /**
  * Migration class for the AuditTrailDatabase of the AuditTrailService.
  * Will only try to perform the migration on an embedded derby database.
  */
 public class IntegrityDatabaseMigrator extends DatabaseMigrator {
-    /** The log.*/
     private static final Logger log = LoggerFactory.getLogger(DatabaseUtils.class);
-    
-    /** The name of the version table entry for the database.*/
+    /**
+     * The name of the version table entry for the database.
+     */
     private final static String DATABASE_VERSION_ENTRY = "integritydb";
-    /** The name of the version entry for the fileinfo table.*/
+    /**
+     * The name of the version entry for the fileinfo table.
+     */
     private final static String FILEINFO_TABLE_VERSION_ENTRY = "fileinfo";
-    /** The name of the update script for version 2 to 3.*/
+    /**
+     * The name of the update script for version 2 to 3.
+     */
     private static final String UPDATE_SCRIPT_VERSION_2_TO_3 = "sql/derby/integrityDB2to3migration.sql";
-    /** The name of the update script for version 3 to 4.*/
+    /**
+     * The name of the update script for version 3 to 4.
+     */
     private static final String UPDATE_SCRIPT_VERSION_3_TO_4 = "sql/derby/integrityDB3to4migration.sql";
-    /** The name of the update script for version 4 to 5.*/
+    /**
+     * The name of the update script for version 4 to 5.
+     */
     private static final String UPDATE_SCRIPT_VERSION_4_TO_5 = "sql/derby/integrityDB4to5Migration.sql";
-    /** The name of the update script for version 5 to 6.*/
+    /**
+     * The name of the update script for version 5 to 6.
+     */
     private static final String UPDATE_SCRIPT_VERSION_5_TO_6 = "sql/derby/integrityDB5to6Migration.sql";
-    /** The name of the update script for version 6 to 7.*/
+    /**
+     * The name of the update script for version 6 to 7.
+     */
     private static final String UPDATE_SCRIPT_VERSION_6_TO_7 = "sql/derby/integrityDB6to7migration.sql";
-    /** The current version of the database. */
+    /**
+     * The current version of the database.
+     */
     private final Integer currentVersion = 7;
-    
+
     /**
-     * Constructor.
      * @param connector connection to the database.
      */
     public IntegrityDatabaseMigrator(DBConnector connector) {
         super(connector);
     }
-    
+
     @Override
     public void migrate() {
         Map<String, Integer> versions = getTableVersions();
-        
-        if(!versions.containsKey(FILEINFO_TABLE_VERSION_ENTRY)) {
-            throw new IllegalStateException("The database does not contain '" + FILEINFO_TABLE_VERSION_ENTRY 
+
+        if (!versions.containsKey(FILEINFO_TABLE_VERSION_ENTRY)) {
+            throw new IllegalStateException("The database does not contain '" + FILEINFO_TABLE_VERSION_ENTRY
                     + "' version entry as required.");
         }
-        if(!versions.containsKey(DATABASE_VERSION_ENTRY)) {
-            throw new IllegalStateException("The database does not contain '" + DATABASE_VERSION_ENTRY 
+        if (!versions.containsKey(DATABASE_VERSION_ENTRY)) {
+            throw new IllegalStateException("The database does not contain '" + DATABASE_VERSION_ENTRY
                     + "' version entry as required.");
         }
-        
-        if(versions.get(DATABASE_VERSION_ENTRY) < 2) {
+
+        if (versions.get(DATABASE_VERSION_ENTRY) < 2) {
             throw new IllegalStateException("The integrityDB is of version 1, migration is not supported. "
                     + "Create a new database, or handle migration by hand.");
         }
-        if(versions.get(DATABASE_VERSION_ENTRY) < 3) {
+        if (versions.get(DATABASE_VERSION_ENTRY) < 3) {
             log.warn("Migrating integrityDB from version 2 to 3.");
             migrateDerbyDatabase(UPDATE_SCRIPT_VERSION_2_TO_3);
         }
-        
+
         versions = getTableVersions();
-        if(versions.get(DATABASE_VERSION_ENTRY) < 4 && versions.get(FILEINFO_TABLE_VERSION_ENTRY).equals(3)) {
+        if (versions.get(DATABASE_VERSION_ENTRY) < 4 && versions.get(FILEINFO_TABLE_VERSION_ENTRY).equals(3)) {
             log.warn("Migrating integrityDB from version 3 to 4.");
             migrateDerbyDatabase(UPDATE_SCRIPT_VERSION_3_TO_4);
         }
-        if(versions.get(DATABASE_VERSION_ENTRY) < 5) {
+        if (versions.get(DATABASE_VERSION_ENTRY) < 5) {
             log.warn("Migrating integrityDB from version 4 to 5");
             migrateDerbyDatabase(UPDATE_SCRIPT_VERSION_4_TO_5);
         }
-        if(versions.get(DATABASE_VERSION_ENTRY) < 6) {
+        if (versions.get(DATABASE_VERSION_ENTRY) < 6) {
             log.warn("Migrating integrityDB from version 5 to 6");
             migrateDerbyDatabase(UPDATE_SCRIPT_VERSION_5_TO_6);
         }
-        if(versions.get(DATABASE_VERSION_ENTRY) < 7) {
+        if (versions.get(DATABASE_VERSION_ENTRY) < 7) {
             log.warn("Migrating integrityDB from version 6 to 7");
             migrateDerbyDatabase(UPDATE_SCRIPT_VERSION_6_TO_7);
         }
@@ -106,16 +119,12 @@ public void migrate() {
     @Override
     public boolean needsMigration() {
         Map<String, Integer> versions = getTableVersions();
-        
-        if(!versions.containsKey(DATABASE_VERSION_ENTRY)) {
-            throw new IllegalStateException("The database does not contain '" + DATABASE_VERSION_ENTRY 
+
+        if (!versions.containsKey(DATABASE_VERSION_ENTRY)) {
+            throw new IllegalStateException("The database does not contain '" + DATABASE_VERSION_ENTRY
                     + "' table as required.");
         }
-        
-        if(versions.get(DATABASE_VERSION_ENTRY) < currentVersion) {
-            return true;
-        } else {
-            return false;
-        }
+
+        return versions.get(DATABASE_VERSION_ENTRY) < currentVersion;
     }
 }
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/IntegrityModel.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/IntegrityModel.java
index 70ad7f478..31d3a8ed6 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/IntegrityModel.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/IntegrityModel.java
@@ -8,201 +8,221 @@
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.integrityservice.cache;
 
-import java.util.Collection;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
 import org.bitrepository.bitrepositoryelements.ChecksumDataForChecksumSpecTYPE;
 import org.bitrepository.bitrepositoryelements.FileIDsData;
 import org.bitrepository.integrityservice.cache.database.IntegrityIssueIterator;
 import org.bitrepository.integrityservice.statistics.StatisticsCollector;
 
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
 /**
  * Store of cached integrity information.
  */
 public interface IntegrityModel {
     /**
      * Add file ID data to cache.
-     * @param data The received data.
-     * @param pillarID The id of the pillar the received data comes from.
+     *
+     * @param data         The received data.
+     * @param pillarID     The id of the pillar the received data comes from.
      * @param collectionID The id of the collection the received data belongs to.
      */
     void addFileIDs(FileIDsData data, String pillarID, String collectionID);
 
     /**
      * Add checksum data to cache.
-     * @param data The received data.
-     * @param pillarID The id of the pillar the received data comes from.
+     *
+     * @param data         The received data.
+     * @param pillarID     The id of the pillar the received data comes from.
      * @param collectionID The id of the collection the received data belongs to.
      */
     void addChecksums(List<ChecksumDataForChecksumSpecTYPE> data, String pillarID, String collectionID);
 
     /**
      * Retrieves the information of a given file id for all pillars.
-     * @param fileID The id of the file.
+     *
+     * @param fileID       The id of the file.
      * @param collectionID The id of the collection the file belongs to
      * @return The collection of information about this file.
      */
     Collection<FileInfo> getFileInfos(String fileID, String collectionID);
-    
+
     /**
      * Reset the status of fileID collection
+     *
      * @param collectionID The collection to reset the fileID collection status of
      */
     void resetFileCollectionProgress(String collectionID);
-    
+
     /**
      * Reset the status of the checksum collection
+     *
      * @param collectionID The collection to reset the checksum collection status of
      */
     void resetChecksumCollectionProgress(String collectionID);
-    
+
     /**
      * Retrieves the number of files in a collection
+     *
      * @param collectionID The ID of the collection
      * @return The number of files in the collection
      */
     long getNumberOfFilesInCollection(String collectionID);
-    
+
     /**
      * Get an IntegrityIssueIterator for the files for a given pillar, restricted by first index and max results.
-     * @param pillarID The id of the pillar.
-     * @param firstIndex The index of the first result.
-     * @param maxResults The maximum number of results.
+     *
+     * @param pillarID     The id of the pillar.
+     * @param firstIndex   The index of the first result.
+     * @param maxResults   The maximum number of results.
      * @param collectionID The ID of the collection to get files from
      * @return The list of file ids for the pillar, between min and max.
      */
     IntegrityIssueIterator getFilesOnPillar(String pillarID, long firstIndex, long maxResults, String collectionID);
-    
+
     /**
      * An IntegrityIssueIterator for files with less than the expected number of copies, restricted by first index and max results.
-     * @param collectionID The ID of the collection to get missing files from
+     *
+     * @param collectionID   The ID of the collection to get missing files from
      * @param expectedCopies The number of expected copies.
-     * @param firstIndex The first index to get results from.
-     * @param maxResults The maximum number of results.
-     * @return The IntegrityIssueIterator for fileids of files that don't have the expected number of files, 
+     * @param firstIndex     The first index to get results from.
+     * @param maxResults     The maximum number of results.
+     * @return The IntegrityIssueIterator for fileids of files that don't have the expected number of files,
      * between min and max.
      */
-    IntegrityIssueIterator findFilesWithMissingCopies(String collectionID, int expectedCopies, 
-            Long firstIndex, Long maxResults);
-    
+    IntegrityIssueIterator findFilesWithMissingCopies(String collectionID, int expectedCopies,
+                                                      Long firstIndex, Long maxResults);
+
     /**
      * Removes the record of the given fileID for the given pillar
+     *
      * @param collectionID The id of the collection the file belongs to.
-     * @param pillarID The id of the pillar that the record is about
-     * @param fileID The id of the file to be removed from cache.
+     * @param pillarID     The id of the pillar that the record is about
+     * @param fileID       The id of the file to be removed from cache.
      */
     void deleteFileIdEntry(String collectionID, String pillarID, String fileID);
-    
+
     /**
      * Locates the files which exists but are missing their checksum on a given pillar.
      * Checksums are considered missing if they are not present (NULL in the database), or the checksum
-     * entry have not been updated since a given date. 
+     * entry have not been updated since a given date.
+     *
      * @param collectionID The collection in which to look for missing checksums
-     * @param pillarID The pillar on which to look for missing checksums
-     * @param cutoffDate The latest date that the checksums should have been seen to not be considered missing
+     * @param pillarID     The pillar on which to look for missing checksums
+     * @param cutoffDate   The latest date that the checksums should have been seen to not be considered missing
      * @return The IntegrityIssueIterator of file ids for the files which exists but are missing their checksum at any pillar.
      */
     IntegrityIssueIterator findFilesWithMissingChecksum(String collectionID, String pillarID, Date cutoffDate);
-    
+
     /**
      * Locates the id of all the files which are older than a given date.
-     * @param date The date for the checksum to be older than.
-     * @param pillarID The pillar to get checksums from
+     *
+     * @param date         The date for the checksum to be older than.
+     * @param pillarID     The pillar to get checksums from
      * @param collectionID The collection to where the files belong
      * @return The IntegrityIssueIterator of ids for the files which have an old checksum.
      */
     IntegrityIssueIterator findChecksumsOlderThan(Date date, String pillarID, String collectionID);
-    
+
     /**
      * Finds orphan files on a pillar in a given collection, i.e. files that no longer exists on the pillar
+     *
      * @param collectionID The ID of the collection in which to find orphan files.
-     * @param pillarID The ID of the pillar on which to look for orphan files.
-     * @param cutoffDate The date after which the file need to have been updated to not be considered orphan
-     * @return The list of orphan files   
+     * @param pillarID     The ID of the pillar on which to look for orphan files.
+     * @param cutoffDate   The date after which the file need to have been updated to not be considered orphan
+     * @return The list of orphan files
      */
     IntegrityIssueIterator findOrphanFiles(String collectionID, String pillarID, Date cutoffDate);
-    
+
     /**
      * Retrieves the list of file ids for the files, where the pillars does not agree about the checksums.
+     *
      * @param collectionID The ID of the collection in which to get files from.
      * @return The IntegrityIssueIterator of file ids for the files with inconsistent checksums.
      */
     IntegrityIssueIterator getFilesWithInconsistentChecksums(String collectionID);
-      
+
     /**
      * Retrieves the date for the latest file entry for a given collection.
-     * E.g. the date for the latest file which has been positively identified as existing in the collection.  
+     * E.g. the date for the latest file which has been positively identified as existing in the collection.
+     *
      * @param collectionID The ID of the collection to look in
      * @return The requested date.
      */
-     Date getDateForNewestFileEntryForCollection(String collectionID);
-    
+    Date getDateForNewestFileEntryForCollection(String collectionID);
+
     /**
      * Retrieves the date for the latest file entry for a given pillar.
-     * E.g. the date for the latest file which has been positively identified as existing on the given pillar.  
-     * @param pillarID The pillar whose latest file entry is requested.
+     * E.g. the date for the latest file which has been positively identified as existing on the given pillar.
+     *
+     * @param pillarID     The pillar whose latest file entry is requested.
      * @param collectionID The ID of the collection to look in
      * @return The requested date.
      */
     Date getDateForNewestFileEntryForPillar(String pillarID, String collectionID);
-    
+
     /**
      * Retrieves the date for the latest checksum entry for a given pillar.
-     * E.g. the date for the latest checksum which has been positively identified as valid on the given pillar.  
-     * @param pillarID The pillar whose latest checksum entry is requested.
+     * E.g. the date for the latest checksum which has been positively identified as valid on the given pillar.
+     *
+     * @param pillarID     The pillar whose latest checksum entry is requested.
      * @param collectionID The ID of the collection to look in
      * @return The requested date.
      */
     Date getDateForNewestChecksumEntryForPillar(String pillarID, String collectionID);
-    
+
     /**
      * Retrieves the accumulated size of the files in the given collection
+     *
      * @param collectionID The ID of the collection
      * @return The accumulated size of the files in the collection.
      */
     Long getCollectionFileSize(String collectionID);
-    
+
     /**
      * Retreives the metrics for the pillars in the given collection
      * I.e. the summed filesize and file count per pillar
+     *
      * @param collectionID The ID of the collection to get metrics for
      * @return A mapping between pillars in the collection and the PillarCollectionMetric
      */
     Map<String, PillarCollectionMetric> getPillarCollectionMetrics(String collectionID);
-    
+
     /**
-     *  Retrieves the latest collection statistics for the given collection
-     *  @param collectionID The ID of the collection
-     *  @param count the count?
-     *  @return {@link CollectionStat} The latest collection statistics object for the collection
+     * Retrieves the latest collection statistics for the given collection
+     *
+     * @param collectionID The ID of the collection
+     * @param count        the count?
+     * @return {@link CollectionStat} The latest collection statistics object for the collection
      */
     List<CollectionStat> getLatestCollectionStat(String collectionID, int count);
-    
+
     /**
      * Retrieves the lastest statistics for the set of pillars in the given collection
+     *
      * @param collectionID The ID of the collection
-     * @return {@link PillarCollectionStat} The latest pillar statistics for the pillars in the collection 
+     * @return {@link PillarCollectionStat} The latest pillar statistics for the pillars in the collection
      */
     List<PillarCollectionStat> getLatestPillarStats(String collectionID);
-    
+
     /**
      * Shutdown the model. This will typically consist of closing DB connections.
      */
@@ -210,23 +230,26 @@ IntegrityIssueIterator findFilesWithMissingCopies(String collectionID, int expec
 
     /**
      * Create the statistics entries in the database based on the information from the StatisticsCollector
-     * @param collectionID The ID of the collection
-     * @param statisticsCollector the collection with information needed to create the statistics entries. 
+     *
+     * @param collectionID        The ID of the collection
+     * @param statisticsCollector the collection with information needed to create the statistics entries.
      */
-    void createStatistics(String collectionID,  StatisticsCollector statisticsCollector);
-    
+    void createStatistics(String collectionID, StatisticsCollector statisticsCollector);
+
     /**
-     * Get the earliest date a specific file on any pillar in a given collection. 
+     * Get the earliest date a specific file on any pillar in a given collection.
+     *
      * @param collectionID The ID of the collection
-     * @param fileID The ID of the file
+     * @param fileID       The ID of the file
      * @return the earliest date a specific file on any pillar in a given collection.
      */
     Date getEarliestFileDate(String collectionID, String fileID);
-    
+
     /**
      * Get the FileID at the specific index position.
+     *
      * @param collectionID The ID of the collection.
-     * @param position The index position for the FileID to retrieve.
+     * @param position     The index position for the FileID to retrieve.
      * @return The FileID at the specific index position.
      */
     String getFileIDAtPosition(String collectionID, Long position);
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/PillarCollectionMetric.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/PillarCollectionMetric.java
index 88c0a48a9..5157b58b2 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/PillarCollectionMetric.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/PillarCollectionMetric.java
@@ -2,22 +2,23 @@
 
 /**
  * Class to carry information of collection specific pillar metrics.
- * The class exists as java is not able to handle simple tuples, 
+ * The class exists as java is not able to handle simple tuples,
  * so the class is meant to carry data in a specific context.
- * @see org.bitrepository.integrityservice.cache.database.IntegrityDAO#getPillarCollectionMetrics(String) 
+ *
+ * @see org.bitrepository.integrityservice.cache.database.IntegrityDAO#getPillarCollectionMetrics(String)
  */
 public class PillarCollectionMetric {
 
     /**
-     * The summed size of the files in a collection on the pillar. 
+     * The summed size of the files in a collection on the pillar.
      */
     private final long pillarCollectionSize;
-    
+
     /**
      * The count of files present in a collection on a pillar
      */
     private final long pillarFileCount;
-        
+
     public PillarCollectionMetric(Long pillarCollectionSize, Long pillarFileCount) {
         this.pillarCollectionSize = pillarCollectionSize == null ? 0 : pillarCollectionSize;
         this.pillarFileCount = pillarFileCount == null ? 0 : pillarFileCount;
@@ -26,9 +27,9 @@ public PillarCollectionMetric(Long pillarCollectionSize, Long pillarFileCount) {
     public long getPillarCollectionSize() {
         return pillarCollectionSize;
     }
-    
+
     public long getPillarFileCount() {
         return pillarFileCount;
     }
-   
+
 }
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/PillarCollectionStat.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/PillarCollectionStat.java
index 8b02b8e10..b1b921c62 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/PillarCollectionStat.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/PillarCollectionStat.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2013 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -24,38 +24,27 @@
 import java.util.Date;
 
 /**
- * Statistics class for holding the statistics data going in and out of the database 
+ * Statistics class for holding the statistics data going in and out of the database
  */
 public class PillarCollectionStat {
-
-    /** The ID of the pillar */
     private final String pillarID;
-    /** The ID of the collection */
     private final String collectionID;
-    /** The number of files in the collection */
     private Long fileCount = 0L;
-    /** The size of the collection */
-    private Long dataSize = 0L; 
-    /** The number of missing files on the pillar */
-    private Long missingFiles = 0L; 
-    /** The number of obsolete checksums on the pillar */
+    private Long dataSize = 0L;
+    private Long missingFiles = 0L;
     private Long obsoleteChecksums = 0L;
-    /** The number of missing checksums on the pillar */
     private Long missingChecksums = 0L;
-    /** The number of checksum errors */
     private Long checksumErrors = 0L;
-    /** The date that the statistics were collected */
     private Date statsTime;
-    /** The date that the statistics were updated */
     private Date updateTime;
-    
+
     public PillarCollectionStat(String pillarID, String collectionID) {
         this.pillarID = pillarID;
         this.collectionID = collectionID;
     }
-    
-    public PillarCollectionStat(String pillarID, String collectionID, Long fileCount, Long dataSize, Long missingFiles, 
-            Long checksumErrors, Long missingChecksums, Long obsoleteChecksum, Date statsTime, Date updateTime) {
+
+    public PillarCollectionStat(String pillarID, String collectionID, Long fileCount, Long dataSize, Long missingFiles,
+                                Long checksumErrors, Long missingChecksums, Long obsoleteChecksum, Date statsTime, Date updateTime) {
         this.pillarID = pillarID;
         this.collectionID = collectionID;
         this.fileCount = fileCount;
@@ -67,46 +56,59 @@ public PillarCollectionStat(String pillarID, String collectionID, Long fileCount
         this.statsTime = statsTime;
         this.updateTime = updateTime;
     }
-    
+
     public String getPillarID() {
         return pillarID;
     }
+
     public String getCollectionID() {
         return collectionID;
     }
+
     public Long getFileCount() {
         return fileCount;
     }
+
     public void setFileCount(Long fileCount) {
         this.fileCount = fileCount;
     }
+
     public Long getDataSize() {
         return dataSize;
     }
+
     public void setDataSize(Long dataSize) {
         this.dataSize = dataSize;
     }
+
     public Long getMissingFiles() {
         return missingFiles;
     }
+
     public void setMissingFiles(Long missingFiles) {
         this.missingFiles = missingFiles;
     }
+
     public Long getChecksumErrors() {
         return checksumErrors;
     }
+
     public void setChecksumErrors(Long checksumErrors) {
         this.checksumErrors = checksumErrors;
     }
+
     public Date getStatsTime() {
         return statsTime;
     }
+
     public void setStatsTime(Date statsTime) {
         this.statsTime = statsTime;
     }
+
     public Date getUpdateTime() {
         return updateTime;
     }
+
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
@@ -126,5 +128,5 @@ public Long getMissingChecksums() {
     public void setMissingChecksums(Long missingChecksums) {
         this.missingChecksums = missingChecksums;
     }
-    
+
 }
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/database/ChecksumUpdater.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/database/ChecksumUpdater.java
index ecee2ee13..9899c4b0c 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/database/ChecksumUpdater.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/database/ChecksumUpdater.java
@@ -5,28 +5,22 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.integrityservice.cache.database;
 
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.util.Date;
-import java.util.List;
-
 import org.bitrepository.bitrepositoryelements.ChecksumDataForChecksumSpecTYPE;
 import org.bitrepository.common.ArgumentValidator;
 import org.bitrepository.common.utils.Base16Utils;
@@ -35,37 +29,43 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.util.Date;
+import java.util.List;
+
 /**
- * Class to handle the update of fileIDs information in the integrity database. 
- * Does this by batching of sql statements for performance.  
- * 
- *  Implementation detail: Postgres will first feature 'upsert' functionality in version 9.5. 
- *  This means that we currently can't use the functionality, and is forced
- *  to use the two call way. I.e. the conditional update, the conditional insert 
- *  
- *  When updating checksums, if a file was not known by the database it is inserted and the 
- *  timestamp for the file is set to the checksum timestamp. 
- *  This should be no problem since 1) it will get overwritten the next time the files is reported
- *  and 2) the pillar calculated a checksum meaning that at that time the pillar must have had the 
- *  file.  
+ * Class to handle the update of fileIDs information in the integrity database.
+ * Does this by batching of sql statements for performance.
+ * <p>
+ * Implementation detail: Postgres will first feature 'upsert' functionality in version 9.5.
+ * This means that we currently can't use the functionality, and is forced
+ * to use the two call way. I.e. the conditional update, the conditional insert
+ * <p>
+ * When updating checksums, if a file was not known by the database it is inserted and the
+ * timestamp for the file is set to the checksum timestamp.
+ * This should be no problem since 1) it will get overwritten the next time the files is reported
+ * and 2) the pillar calculated a checksum meaning that at that time the pillar must have had the
+ * file.
  */
 public class ChecksumUpdater {
 
     /**
      * SQL for conditional insert of the fileID in the files table.
-     * The insert is only performed when the (file_id, collection_key) 
-     * tuple is not already found in the database  
+     * The insert is only performed when the (file_id, collection_key)
+     * tuple is not already found in the database
      */
     private final String insertFileInfoWithChecksumSql = "INSERT INTO fileinfo ("
             + " collectionID, pillarID, fileID, file_timestamp, last_seen_getfileids,"
             + " checksum, checksum_timestamp, last_seen_getchecksums)"
             + " (SELECT collectionID, ?, ?, ?, ?, ?, ?, ? FROM collections"
-                + " WHERE collectionID = ?"
-                + " AND NOT EXISTS ("
-                    + " SELECT * FROM fileinfo "
-                    + " WHERE fileID = ?"
-                    + " AND collectionID = ?"
-                    + " AND pillarID = ?))";
+            + " WHERE collectionID = ?"
+            + " AND NOT EXISTS ("
+            + " SELECT * FROM fileinfo "
+            + " WHERE fileID = ?"
+            + " AND collectionID = ?"
+            + " AND pillarID = ?))";
 
     private final String updateChecksumSql = "UPDATE fileinfo "
             + "	SET checksum = ?,"
@@ -73,23 +73,23 @@ public class ChecksumUpdater {
             + " last_seen_getchecksums = ?"
             + " WHERE fileID = ?"
             + "	AND collectionID = ?"
-            + " AND pillarID = ?";	
+            + " AND pillarID = ?";
 
     private final String insertLatestChecksumTime = "INSERT INTO collection_progress "
             + "(collectionID, pillarID, latest_checksum_timestamp)"
             + " ( SELECT collectionID, ?, ? FROM collections"
-                + " WHERE collectionID = ?"
-                + " AND NOT EXISTS ("
-                    + " SELECT * FROM collection_progress"
-                    + " WHERE collectionID = ?"
-                    + " AND pillarID = ?))";
+            + " WHERE collectionID = ?"
+            + " AND NOT EXISTS ("
+            + " SELECT * FROM collection_progress"
+            + " WHERE collectionID = ?"
+            + " AND pillarID = ?))";
 
     private final String updateLatestChecksumTime = "UPDATE collection_progress"
             + " SET latest_checksum_timestamp = ? "
             + " WHERE collectionID = ?"
             + " AND pillarID = ?";
 
-    private Logger log = LoggerFactory.getLogger(getClass());
+    private final Logger log = LoggerFactory.getLogger(getClass());
 
     private final String collectionID;
     private final String pillar;
@@ -114,7 +114,8 @@ private void init() throws SQLException {
     }
 
     /**
-     * Method to handle the actual update.  
+     * Method to handle the actual update.
+     *
      * @param data The date to update the database with
      */
     public void updateChecksums(List<ChecksumDataForChecksumSpecTYPE> data) {
@@ -124,11 +125,11 @@ public void updateChecksums(List<ChecksumDataForChecksumSpecTYPE> data) {
             log.debug("Initialized checksumUpdater");
             try {
                 Date maxDate = new Date(0);
-                for(ChecksumDataForChecksumSpecTYPE csData : data) {
+                for (ChecksumDataForChecksumSpecTYPE csData : data) {
                     updateChecksum(csData);
                     addFileInfoWithChecksum(csData);
-                    maxDate = TimeUtils.getMaxDate(maxDate, 
-                            CalendarUtils.convertFromXMLGregorianCalendar(csData.getCalculationTimestamp()));                	
+                    maxDate = TimeUtils.getMaxDate(maxDate,
+                            CalendarUtils.convertFromXMLGregorianCalendar(csData.getCalculationTimestamp()));
                 }
                 updateMaxTime(maxDate);
                 log.debug("Done building file update batch");
@@ -140,7 +141,7 @@ public void updateChecksums(List<ChecksumDataForChecksumSpecTYPE> data) {
         } catch (SQLException e) {
             log.error("Failed to update files", e);
         }
-    } 
+    }
 
     private void addFileInfoWithChecksum(ChecksumDataForChecksumSpecTYPE item) throws SQLException {
         long calculationTime = CalendarUtils.convertFromXMLGregorianCalendar(item.getCalculationTimestamp()).getTime();
@@ -194,13 +195,13 @@ private void execute() throws SQLException {
     }
 
     private void close() throws SQLException {
-        if(updateChecksumPS != null) {
+        if (updateChecksumPS != null) {
             updateChecksumPS.close();
         }
-        if(insertFileInfoPS != null) {
+        if (insertFileInfoPS != null) {
             insertFileInfoPS.close();
         }
-        if(conn != null) {
+        if (conn != null) {
             conn.setAutoCommit(true);
             conn.close();
         }
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/database/DerbyIntegrityDAO.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/database/DerbyIntegrityDAO.java
index 53b711582..6fac7de94 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/database/DerbyIntegrityDAO.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/database/DerbyIntegrityDAO.java
@@ -5,31 +5,31 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.integrityservice.cache.database;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.bitrepository.common.utils.SettingsUtils;
 import org.bitrepository.service.database.DBConnector;
 import org.bitrepository.service.database.DatabaseUtils;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
- * Class handling the specifics of IntegrityDAO when the database is based on Derby 
+ * Class handling the specifics of IntegrityDAO when the database is based on Derby
  */
 public class DerbyIntegrityDAO extends IntegrityDAO {
 
@@ -39,76 +39,71 @@ public DerbyIntegrityDAO(DBConnector dbConnector) {
 
     @Override
     protected String getFindFilesWithMissingCopiesSql() {
-        String findFilesSql = "SELECT fileid FROM fileinfo"
+        return "SELECT fileid FROM fileinfo"
                 + " WHERE collectionid = ?"
                 + " GROUP BY fileid"
                 + " HAVING COUNT(fileid) < ?"
                 + " ORDER BY fileid"
                 + " OFFSET ? ROWS"
                 + " FETCH FIRST ? ROWS ONLY";
-        
-        return findFilesSql;
     }
-    
+
     @Override
     protected synchronized void initializePillars() {
         List<String> pillars = new ArrayList<>(SettingsUtils.getAllPillarIDs());
-        
+
         String getExistingPillars = "SELECT pillarID FROM pillar";
-        
-        List<String> pillarsInDb = DatabaseUtils.selectStringList(dbConnector, getExistingPillars, new Object[0]);
+
+        List<String> pillarsInDb = DatabaseUtils.selectStringList(dbConnector, getExistingPillars);
         pillars.removeAll(pillarsInDb);
-        
-        for(String pillar : pillars) {
+
+        for (String pillar : pillars) {
             String sql = "INSERT INTO pillar (pillarID) VALUES (?)";
             DatabaseUtils.executeStatement(dbConnector, sql, pillar);
-        }        
+        }
     }
 
     @Override
     protected synchronized void initializeCollections() {
         List<String> collections = new ArrayList<>(SettingsUtils.getAllCollectionsIDs());
-        
+
         String getExistingPillars = "SELECT collectionID FROM collections";
-        
-        List<String> collectionsInDb = DatabaseUtils.selectStringList(dbConnector, getExistingPillars, new Object[0]);
+
+        List<String> collectionsInDb = DatabaseUtils.selectStringList(dbConnector, getExistingPillars);
         collections.removeAll(collectionsInDb);
-        
-        for(String collection : collections) {
+
+        for (String collection : collections) {
             String sql = "INSERT INTO collections (collectionID) VALUES (?)";
             DatabaseUtils.executeStatement(dbConnector, sql, collection);
         }
     }
-    
+
     @Override
     protected String getAllFileIDsSql() {
-        String getAllFileIDsSql = "SELECT fileID FROM fileinfo"
+        return "SELECT fileID FROM fileinfo"
                 + " WHERE collectionID = ?"
                 + " AND pillarID = ?"
                 + " ORDER BY fileID"
                 + " OFFSET ? ROWS"
                 + " FETCH FIRST ? ROWS ONLY";
-        return getAllFileIDsSql;
     }
-    
+
     @Override
     protected String getLatestCollectionStatsSql() {
-        String latestCollectionStatSql = "SELECT file_count, file_size, checksum_errors_count, latest_file_date,"
+        return "SELECT file_count, file_size, checksum_errors_count, latest_file_date,"
                 + " stat_time, last_update FROM collectionstats"
                 + " JOIN stats ON collectionstats.stat_key = stats.stat_key"
                 + " WHERE stats.collectionID = ?"
                 + " ORDER BY stats.stat_time DESC"
                 + " FETCH FIRST ? ROWS ONLY";
-        return latestCollectionStatSql;
     }
 
     @Override
     protected String getFileIdAtIndexSql() {
-        String getFileIDAtIndexSql = "SELECT DISTINCT( fileID ) FROM fileinfo"
+        return "SELECT DISTINCT( fileID ) FROM fileinfo"
                 + " WHERE collectionID = ?"
                 + " OFFSET ? ROWS"
                 + " FETCH FIRST ? ROWS ONLY";
-        return getFileIDAtIndexSql;
     }
 
 }
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/database/FileUpdater.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/database/FileUpdater.java
index f8a89686c..902726956 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/database/FileUpdater.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/database/FileUpdater.java
@@ -5,28 +5,22 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.integrityservice.cache.database;
 
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.sql.Types;
-import java.util.Date;
-
 import org.bitrepository.bitrepositoryelements.FileIDsData.FileIDsDataItems;
 import org.bitrepository.bitrepositoryelements.FileIDsDataItem;
 import org.bitrepository.common.utils.CalendarUtils;
@@ -34,54 +28,45 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.sql.Types;
+import java.util.Date;
+
 /**
- * Class to handle the update of fileIDs information in the integrity database. 
- * Does this by batching of sql statements for performance.  
- * 
- *  Implementation detail: Postgres will first feature 'upsert' functionality in version 9.5. 
- *  This means that we currently can't use the functionality, and is forced
- *  to use the two call way. I.e. the conditional update, the conditional insert 
+ * Class to handle the update of fileIDs information in the integrity database.
+ * Does this by batching of sql statements for performance.
+ * <p>
+ * Implementation detail: Postgres will first feature 'upsert' functionality in version 9.5.
+ * This means that we currently can't use the functionality, and is forced
+ * to use the two call way. I.e. the conditional update, the conditional insert
  */
 public class FileUpdater {
 
     /**
      * SQL for conditional insert of the fileID in the files table.
-     * The insert is only performed when the (file_id, collection_key) 
-     * tuple is not already found in the database  
+     * The insert is only performed when the (file_id, collection_key)
+     * tuple is not already found in the database
      */
-    private final String insertFileInfoSql = "INSERT INTO fileinfo ("
-    		+ " collectionID, pillarID, fileID, filesize, file_timestamp, last_seen_getfileids)"
-    		+ " (SELECT collectionID, ?, ?, ?, ?, ? FROM collections"
-    		+ " WHERE collectionID = ? "
-    		+ " AND NOT EXISTS ("
-    			+ " SELECT * FROM fileinfo "
-    			+ " WHERE fileID = ?"
-    			+ " AND collectionID = ?"
-    			+ " AND pillarID = ?))";
-    
-    private final String updateFileInfoSql = "UPDATE fileinfo "
-    		+ "	SET filesize = ?,"
-    		+ " file_timestamp = ?,"
-    		+ " last_seen_getfileids = ?"
-    		+ " WHERE fileID = ?"
-    		+ "	AND collectionID = ?"
-    		+ " AND pillarID = ?";	
-    
-    private final String insertLatestFileTime = "INSERT INTO collection_progress "
-            + "(collectionID, pillarID, latest_file_timestamp)"
-            + " ( SELECT collectionID, ?, ? FROM collections"
-                + " WHERE collectionID = ?"
-                + " AND NOT EXISTS ( SELECT * FROM collection_progress"
-                    + " WHERE collectionID = ?"
-                    + " AND pillarID = ?))";
-
-    private final String updateLatestFileTime = "UPDATE collection_progress"
-            + " SET latest_file_timestamp = ? "
-            + " WHERE collectionID = ?"
-            + " AND pillarID = ?";
-
-    private Logger log = LoggerFactory.getLogger(getClass());
-    
+    private final String insertFileInfoSql =
+            "INSERT INTO fileinfo (" + " collectionID, pillarID, fileID, filesize, file_timestamp, last_seen_getfileids)" +
+                    " (SELECT collectionID, ?, ?, ?, ?, ? FROM collections" + " WHERE collectionID = ? " + " AND NOT EXISTS (" +
+                    " SELECT * FROM fileinfo " + " WHERE fileID = ?" + " AND collectionID = ?" + " AND pillarID = ?))";
+
+    private final String updateFileInfoSql =
+            "UPDATE fileinfo " + "	SET filesize = ?," + " file_timestamp = ?," + " last_seen_getfileids = ?" + " WHERE fileID = ?" +
+                    "	AND collectionID = ?" + " AND pillarID = ?";
+
+    private final String insertLatestFileTime = "INSERT INTO collection_progress " + "(collectionID, pillarID, latest_file_timestamp)" +
+            " ( SELECT collectionID, ?, ? FROM collections" + " WHERE collectionID = ?" +
+            " AND NOT EXISTS ( SELECT * FROM collection_progress" + " WHERE collectionID = ?" + " AND pillarID = ?))";
+
+    private final String updateLatestFileTime =
+            "UPDATE collection_progress" + " SET latest_file_timestamp = ? " + " WHERE collectionID = ?" + " AND pillarID = ?";
+
+    private final Logger log = LoggerFactory.getLogger(getClass());
+
     private final String collectionID;
     private final String pillar;
     private final Connection conn;
@@ -89,13 +74,13 @@ public class FileUpdater {
     private PreparedStatement updateFileInfoPS;
     private PreparedStatement insertLatestFileTimePS;
     private PreparedStatement updateLatestFileTimePS;
-    
+
     public FileUpdater(String pillar, Connection dbConnection, String collectionID) {
         this.collectionID = collectionID;
         this.pillar = pillar;
         conn = dbConnection;
     }
-    
+
     private void init() throws SQLException {
         conn.setAutoCommit(false);
         insertFileInfoPS = conn.prepareStatement(insertFileInfoSql);
@@ -103,9 +88,10 @@ private void init() throws SQLException {
         insertLatestFileTimePS = conn.prepareStatement(insertLatestFileTime);
         updateLatestFileTimePS = conn.prepareStatement(updateLatestFileTime);
     }
-    
+
     /**
      * Method to handle the actual update.
+     *
      * @param dataItems the FileIDs to update
      */
     public void updateFiles(FileIDsDataItems dataItems) {
@@ -114,11 +100,10 @@ public void updateFiles(FileIDsDataItems dataItems) {
             log.debug("Initialized fileUpdater");
             try {
                 Date maxDate = new Date(0);
-                for(FileIDsDataItem item : dataItems.getFileIDsDataItem()) {
-                	updateFileInfo(item);
-                	addFileInfo(item);
-                	maxDate = TimeUtils.getMaxDate(maxDate, 
-                	        CalendarUtils.convertFromXMLGregorianCalendar(item.getLastModificationTime()));
+                for (FileIDsDataItem item : dataItems.getFileIDsDataItem()) {
+                    updateFileInfo(item);
+                    addFileInfo(item);
+                    maxDate = TimeUtils.getMaxDate(maxDate, CalendarUtils.convertFromXMLGregorianCalendar(item.getLastModificationTime()));
                 }
                 updateMaxTime(maxDate);
                 log.debug("Done building file update batch");
@@ -130,30 +115,30 @@ public void updateFiles(FileIDsDataItems dataItems) {
         } catch (SQLException e) {
             log.error("Failed to update files", e);
         }
-    } 
-    
+    }
+
     private void addFileInfo(FileIDsDataItem item) throws SQLException {
         Date now = new Date();
         insertFileInfoPS.setString(1, pillar);
         insertFileInfoPS.setString(2, item.getFileID());
-    	if(item.getFileSize() == null) {
-        	insertFileInfoPS.setNull(3, Types.BIGINT);
+        if (item.getFileSize() == null) {
+            insertFileInfoPS.setNull(3, Types.BIGINT);
         } else {
-        	insertFileInfoPS.setLong(3, item.getFileSize().longValue());
+            insertFileInfoPS.setLong(3, item.getFileSize().longValue());
         }
-    	long time = CalendarUtils.convertFromXMLGregorianCalendar(item.getLastModificationTime()).getTime();
-    	insertFileInfoPS.setLong(4, time);
-    	insertFileInfoPS.setLong(5, now.getTime());
+        long time = CalendarUtils.convertFromXMLGregorianCalendar(item.getLastModificationTime()).getTime();
+        insertFileInfoPS.setLong(4, time);
+        insertFileInfoPS.setLong(5, now.getTime());
         insertFileInfoPS.setString(6, collectionID);
         insertFileInfoPS.setString(7, item.getFileID());
-    	insertFileInfoPS.setString(8, collectionID);
-    	insertFileInfoPS.setString(9, pillar);
-    	insertFileInfoPS.addBatch();
+        insertFileInfoPS.setString(8, collectionID);
+        insertFileInfoPS.setString(9, pillar);
+        insertFileInfoPS.addBatch();
     }
-    
+
     private void updateFileInfo(FileIDsDataItem item) throws SQLException {
         Date now = new Date();
-        if(item.getFileSize() == null) {
+        if (item.getFileSize() == null) {
             updateFileInfoPS.setNull(1, Types.BIGINT);
         } else {
             updateFileInfoPS.setLong(1, item.getFileSize().longValue());
@@ -166,19 +151,19 @@ private void updateFileInfo(FileIDsDataItem item) throws SQLException {
         updateFileInfoPS.setString(6, pillar);
         updateFileInfoPS.addBatch();
     }
-    
+
     private void updateMaxTime(Date maxDate) throws SQLException {
         updateLatestFileTimePS.setLong(1, maxDate.getTime());
         updateLatestFileTimePS.setString(2, collectionID);
         updateLatestFileTimePS.setString(3, pillar);
-        
+
         insertLatestFileTimePS.setString(1, pillar);
         insertLatestFileTimePS.setLong(2, maxDate.getTime());
         insertLatestFileTimePS.setString(3, collectionID);
         insertLatestFileTimePS.setString(4, collectionID);
         insertLatestFileTimePS.setString(5, pillar);
     }
-    
+
     private void execute() throws SQLException {
         updateFileInfoPS.executeBatch();
         insertFileInfoPS.executeBatch();
@@ -186,15 +171,15 @@ private void execute() throws SQLException {
         insertLatestFileTimePS.execute();
         conn.commit();
     }
-    
+
     private void close() throws SQLException {
-        if(updateFileInfoPS != null) {
+        if (updateFileInfoPS != null) {
             updateFileInfoPS.close();
         }
-        if(insertFileInfoPS != null) {
-        	insertFileInfoPS.close();
+        if (insertFileInfoPS != null) {
+            insertFileInfoPS.close();
         }
-        if(conn != null) {
+        if (conn != null) {
             conn.setAutoCommit(true);
             conn.close();
         }
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/database/IntegrityDAO.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/database/IntegrityDAO.java
index 4950ce395..1456c323c 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/database/IntegrityDAO.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/database/IntegrityDAO.java
@@ -5,33 +5,22 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.integrityservice.cache.database;
 
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 import org.bitrepository.bitrepositoryelements.ChecksumDataForChecksumSpecTYPE;
 import org.bitrepository.bitrepositoryelements.FileIDsData;
 import org.bitrepository.common.ArgumentValidator;
@@ -46,62 +35,79 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
 /**
- * Common parts of the implementation of the access to the integrity db. 
- * Database specific backends are abstracted out in concrete classes.  
+ * Common parts of the implementation of the access to the integrity db.
+ * Database specific backends are abstracted out in concrete classes.
  */
 public abstract class IntegrityDAO {
-	private Logger log = LoggerFactory.getLogger(getClass());
-	
-    /** The connector to the database.*/
+    private final Logger log = LoggerFactory.getLogger(getClass());
+
+    /**
+     * The connector to the database.
+     */
     protected final DBConnector dbConnector;
-    
+
     public IntegrityDAO(DBConnector dbConnector) {
-    	this.dbConnector = dbConnector;
-    	initializePillars();
-    	initializeCollections();
+        this.dbConnector = dbConnector;
+        initializePillars();
+        initializeCollections();
     }
-    
+
     /**
      * Destroys the DB connector.
      */
     public void close() {
         dbConnector.destroy();
     }
-    
+
     /**
-     * Method to ensure that pillars found in RepositorySettings is present in the database 
+     * Method to ensure that pillars found in RepositorySettings is present in the database
      */
     protected abstract void initializePillars();
-    
+
     /**
-     * Method to ensure that collections found in RepositorySettings is present in the database 
+     * Method to ensure that collections found in RepositorySettings is present in the database
      */
     protected abstract void initializeCollections();
-    
+
     /**
      * Get all known collectionIDs from the database
+     *
      * @return a list of all known collectionIDs from the database
      */
     public List<String> getCollections() {
         String sql = "SELECT collectionID FROM collections";
-        return DatabaseUtils.selectStringList(dbConnector, sql, new Object[0]);
+        return DatabaseUtils.selectStringList(dbConnector, sql);
     }
-    
+
     /**
      * Get all known pillarIDs from the database
+     *
      * @return a list of all known pillarIDs from the database
      */
     public List<String> getAllPillars() {
         String sql = "SELECT pillarID FROM pillar";
-        return DatabaseUtils.selectStringList(dbConnector, sql, new Object[0]);
+        return DatabaseUtils.selectStringList(dbConnector, sql);
     }
-    
+
     /**
-     * Update the database with a batch of fileIDs data from a pillar for a given collection. 
+     * Update the database with a batch of fileIDs data from a pillar for a given collection.
      * If the fileIDs is not already present in the database a new record will be created
-     * @param data The FileIDsData to update the database with
-     * @param pillarID The ID of the pillar to update the with the FileIDsData
+     *
+     * @param data         The FileIDsData to update the database with
+     * @param pillarID     The ID of the pillar to update the with the FileIDsData
      * @param collectionID The ID of the collection to update with the FileIDsData
      */
     public void updateFileIDs(FileIDsData data, String pillarID, String collectionID) {
@@ -109,246 +115,237 @@ public void updateFileIDs(FileIDsData data, String pillarID, String collectionID
         ArgumentValidator.checkNotNullOrEmpty(pillarID, "String pillarID");
         ArgumentValidator.checkNotNullOrEmpty(collectionID, "String collectionID");
         log.trace("Updating the file ids '" + data + "' for pillar '" + pillarID + "'");
-        
+
         FileUpdater fu = new FileUpdater(pillarID, dbConnector.getConnection(), collectionID);
         fu.updateFiles(data.getFileIDsDataItems());
     }
-    
+
     /**
-     * Update the database with a batch of checksum data from a pillar for a given collection. 
-     * @param data The list of ChecksumDataForChecksumSpecTYPE to update the database with
-     * @param pillarID The ID of the pillar to update with the data
+     * Update the database with a batch of checksum data from a pillar for a given collection.
+     *
+     * @param data         The list of ChecksumDataForChecksumSpecTYPE to update the database with
+     * @param pillarID     The ID of the pillar to update with the data
      * @param collectionID The ID of the collection to update with the data
      */
     public void updateChecksums(List<ChecksumDataForChecksumSpecTYPE> data, String pillarID, String collectionID) {
-    	ArgumentValidator.checkNotNull(data, "List<ChecksumDataForChecksumSpecTYPE> data");
+        ArgumentValidator.checkNotNull(data, "List<ChecksumDataForChecksumSpecTYPE> data");
         ArgumentValidator.checkNotNullOrEmpty(pillarID, "String pillarID");
         ArgumentValidator.checkNotNullOrEmpty(collectionID, "String collectionID");
-        
+
         ChecksumUpdater cu = new ChecksumUpdater(pillarID, dbConnector.getConnection(), collectionID);
         cu.updateChecksums(data);
     }
 
     /**
-     * Get the date of latest file known on the given pillar in the given collection.
+     * Get the date of the latest file known on the given pillar in the given collection.
+     *
      * @param collectionID The ID of the collection
-     * @param pillarID  The ID of the pillar
+     * @param pillarID     The ID of the pillar
      * @return The date for the latest file in the collection on the pillar
      */
     public Date getLatestFileDate(String collectionID, String pillarID) {
         ArgumentValidator.checkNotNullOrEmpty(pillarID, "String pillarID");
         ArgumentValidator.checkNotNullOrEmpty(collectionID, "String collectionID");
-        
-        String retrieveSql = "SELECT latest_file_timestamp FROM collection_progress" 
-        		+ " WHERE collectionID = ? "
-        		+ " AND pillarID = ?";
-        
+
+        String retrieveSql = "SELECT latest_file_timestamp FROM collection_progress" + " WHERE collectionID = ? " + " AND pillarID = ?";
+
         Long time = DatabaseUtils.selectFirstLongValue(dbConnector, retrieveSql, collectionID, pillarID);
         return (time == null ? null : new Date(time));
     }
-    
+
     /**
      * Get the date of the latest file in the given collection
+     *
      * @param collectionID The ID of the collection
-     * @return The date of the latest file in the collection. 
+     * @return The date of the latest file in the collection.
      */
     public Date getLatestFileDateInCollection(String collectionID) {
         ArgumentValidator.checkNotNullOrEmpty(collectionID, "String collectionID");
-        
-        String retrieveSql = "SELECT MAX(latest_file_timestamp) FROM collection_progress"
-                + " WHERE collectionID = ?";
-        
+
+        String retrieveSql = "SELECT MAX(latest_file_timestamp) FROM collection_progress" + " WHERE collectionID = ?";
+
         Long time = DatabaseUtils.selectFirstLongValue(dbConnector, retrieveSql, collectionID);
         return (time == null ? null : new Date(time));
     }
-    
+
     /**
-     * Get the date of latest known checksum on the given pillar in the given collection.
+     * Get the date of the latest known checksum on the given pillar in the given collection.
+     *
      * @param collectionID The ID of the collection
-     * @param pillarID  The ID of the pillar
+     * @param pillarID     The ID of the pillar
      * @return The date for the latest checksum in the collection on the pillar
      */
     public Date getLatestChecksumDate(String collectionID, String pillarID) {
-    	ArgumentValidator.checkNotNullOrEmpty(pillarID, "String pillarID");
+        ArgumentValidator.checkNotNullOrEmpty(pillarID, "String pillarID");
         ArgumentValidator.checkNotNullOrEmpty(collectionID, "String collectionID");
-        
-        String retrieveSql = "SELECT latest_checksum_timestamp FROM collection_progress" 
-        		+ " WHERE collectionID = ? "
-        		+ " AND pillarID = ?";
+
+        String retrieveSql = "SELECT latest_checksum_timestamp FROM collection_progress" + " WHERE collectionID = ? " + " AND pillarID = ?";
         Long time = DatabaseUtils.selectFirstLongValue(dbConnector, retrieveSql, collectionID, pillarID);
         return (time == null ? null : new Date(time));
     }
-    
+
     /**
      * Reset the file collection progress for a given collection
+     *
      * @param collectionID The ID of the collection to reset file collection progress for
      */
     public void resetFileCollectionProgress(String collectionID) {
         ArgumentValidator.checkNotNullOrEmpty(collectionID, "String collectionID");
-        String resetSql = "UPDATE collection_progress"
-                + " SET latest_file_timestamp = NULL"
-                + " WHERE collectionID = ?";
-        
+        String resetSql = "UPDATE collection_progress" + " SET latest_file_timestamp = NULL" + " WHERE collectionID = ?";
+
         DatabaseUtils.executeStatement(dbConnector, resetSql, collectionID);
     }
-    
+
     /**
      * Reset the checksum collection progress for a given collection
+     *
      * @param collectionID The ID of the collection to reset checksum collection progress for
      */
     public void resetChecksumCollectionProgress(String collectionID) {
         ArgumentValidator.checkNotNullOrEmpty(collectionID, "String collectionID");
-        String resetSql = "UPDATE collection_progress"
-                + " SET latest_checksum_timestamp = NULL"
-                + " WHERE collectionID = ?";
-        
+        String resetSql = "UPDATE collection_progress" + " SET latest_checksum_timestamp = NULL" + " WHERE collectionID = ?";
+
         DatabaseUtils.executeStatement(dbConnector, resetSql, collectionID);
     }
-    
+
     /**
      * Get fileIDs for those files which have outdated checksums
+     *
      * @param collectionID The ID of the collection to get fileIDs from
-     * @param pillarID The ID of the pillar to get fileIDs from
-     * @param maxDate The date prior to which checksums are considered outdated
+     * @param pillarID     The ID of the pillar to get fileIDs from
+     * @param maxDate      The date prior to which checksums are considered outdated
      * @return an Iterator of the fileIDs for those files which have outdated checksums
      */
     public IntegrityIssueIterator getFilesWithOutdatedChecksums(String collectionID, String pillarID, Date maxDate) {
         ArgumentValidator.checkNotNullOrEmpty(pillarID, "String pillarID");
         ArgumentValidator.checkNotNullOrEmpty(collectionID, "String collectionID");
         ArgumentValidator.checkNotNull(maxDate, "Date maxDate");
-        
-        String retrieveSql = "SELECT fileID from fileinfo"
-                + " WHERE collectionID = ?"
-                + " AND pillarID = ?"
-                + " AND checksum_timestamp < ?";
-        
+
+        String retrieveSql =
+                "SELECT fileID from fileinfo" + " WHERE collectionID = ?" + " AND pillarID = ?" + " AND checksum_timestamp < ?";
+
         return makeIntegrityIssueIterator(retrieveSql, collectionID, pillarID, maxDate.getTime());
     }
-    
+
     /**
-     * Get the fileIDs of the files on a given pillar in a given collection which is missing their checksum. 
+     * Get the fileIDs of the files on a given pillar in a given collection which is missing their checksum.
      * A checksum is considered missing if it's entry in the database is either NULL or the checksum have
-     * not been seen after a certain cutoff date. 
+     * not been seen after a certain cutoff date.
+     *
      * @param collectionID The ID of the collection to look for missing checksums
-     * @param pillarID The ID of the pillar on which to look for missing checksums
-     * @param cutoffDate The date after which the checksum should have been seen to not be considered missing
+     * @param pillarID     The ID of the pillar on which to look for missing checksums
+     * @param cutoffDate   The date after which the checksum should have been seen to not be considered missing
      * @return an Iterator of the fileIDs of the files on a given pillar in a given collection which is missing their checksum.
      */
     public IntegrityIssueIterator getFilesWithMissingChecksums(String collectionID, String pillarID, Date cutoffDate) {
         ArgumentValidator.checkNotNullOrEmpty(collectionID, "String collectionID");
         ArgumentValidator.checkNotNullOrEmpty(pillarID, "String pillarID");
-        
-        String retrieveSql = "SELECT fileID from fileinfo"
-                + " WHERE collectionID = ?"
-                + " AND pillarID = ?"
-                + " AND (checksum is NULL"
-                + " OR last_seen_getchecksums < ?)";
-        
+
+        String retrieveSql = "SELECT fileID from fileinfo" + " WHERE collectionID = ?" + " AND pillarID = ?" + " AND (checksum is NULL" +
+                " OR last_seen_getchecksums < ?)";
+
         return makeIntegrityIssueIterator(retrieveSql, collectionID, pillarID, cutoffDate.getTime());
     }
-    
+
     /**
      * Get the fileIDs of files that are no longer on the given pillar in the given collection
+     *
      * @param collectionID The ID of the collection to look for orphan files
-     * @param pillarID The ID of the pillar to look for orphan files
-     * @param cutoffDate The date that a file should have been seen to not be considered orphan
+     * @param pillarID     The ID of the pillar to look for orphan files
+     * @param cutoffDate   The date that a file should have been seen to not be considered orphan
      * @return an Iterator of the fileIDs of files that are no longer on the given pillar in the given collection
      */
     public IntegrityIssueIterator getOrphanFilesOnPillar(String collectionID, String pillarID, Date cutoffDate) {
         ArgumentValidator.checkNotNullOrEmpty(collectionID, "String collectionID");
         ArgumentValidator.checkNotNullOrEmpty(pillarID, "String pillarID");
         ArgumentValidator.checkNotNull(cutoffDate, "Date cutoffDate");
-        
-        String findOrphansSql = "SELECT fileID from fileinfo"
-                + " WHERE collectionID = ?"
-                + " AND pillarID = ?"
-                + " AND last_seen_getfileids < ?";
-        
+
+        String findOrphansSql =
+                "SELECT fileID from fileinfo" + " WHERE collectionID = ?" + " AND pillarID = ?" + " AND last_seen_getfileids < ?";
+
         return makeIntegrityIssueIterator(findOrphansSql, collectionID, pillarID, cutoffDate.getTime());
     }
-    
+
     /**
      * Remove the file entry for a given pillar in a given collection from the database
+     *
      * @param collectionID The ID of the collection
-     * @param pillarID The ID of the pillar
-     * @param fileID The ID of the file
+     * @param pillarID     The ID of the pillar
+     * @param fileID       The ID of the file
      */
     public void removeFile(String collectionID, String pillarID, String fileID) {
         ArgumentValidator.checkNotNullOrEmpty(collectionID, "String collectionID");
         ArgumentValidator.checkNotNullOrEmpty(pillarID, "String pillarID");
         ArgumentValidator.checkNotNullOrEmpty(fileID, "String fileID");
 
-        String removeSql = "DELETE FROM fileinfo"
-                + " WHERE collectionID = ?"
-                + " AND pillarID = ?"
-                + " AND fileID = ?";
-        
+        String removeSql = "DELETE FROM fileinfo" + " WHERE collectionID = ?" + " AND pillarID = ?" + " AND fileID = ?";
+
         DatabaseUtils.executeStatement(dbConnector, removeSql, collectionID, pillarID, fileID);
     }
-    
+
     /**
      * Method that should deliver the database specific SQL for finding files with less than N copies
+     *
      * @return the database specific SQL for finding files with less than N copies
      */
     protected abstract String getFindFilesWithMissingCopiesSql();
-    
+
     /**
      * Method to find files in a given collection missing on a given pillar
-     * @param collectionID The ID of the collection
+     *
+     * @param collectionID   The ID of the collection
      * @param expectedCopies The number of copies that should be present
-     * @param firstIndex start the iterator at this index, or 0 if null
-     * @param maxResults maxResults
+     * @param firstIndex     start the iterator at this index, or 0 if null
+     * @param maxResults     maxResults
      * @return Iterator with the fileIDs that could not be found on the pillar
      */
-    public IntegrityIssueIterator findFilesWithMissingCopies(String collectionID, int expectedCopies, 
-            Long firstIndex, Long maxResults) {
+    public IntegrityIssueIterator findFilesWithMissingCopies(String collectionID, int expectedCopies, Long firstIndex, Long maxResults) {
         ArgumentValidator.checkNotNullOrEmpty(collectionID, "String collectionID");
-        
+
         long first = firstIndex == null ? 0 : firstIndex;
         long maxRes = maxResults == null ? Long.MAX_VALUE : maxResults;
-        
+
         String findFileSql = getFindFilesWithMissingCopiesSql();
-        return makeIntegrityIssueIterator(findFileSql, collectionID, expectedCopies,
-                first, maxRes);
+        return makeIntegrityIssueIterator(findFileSql, collectionID, expectedCopies, first, maxRes);
     }
-    
+
     /**
-     * Method to find the files in a collection where the pillars does not agree upon the checksum
+     * Method to find the files in a collection where the pillars do not agree upon the checksum
+     *
      * @param collectionID The ID of the collection
      * @return Iterator with the fileIDs that have checksum inconsistencies
      */
     public IntegrityIssueIterator findFilesWithChecksumInconsistencies(String collectionID) {
         ArgumentValidator.checkNotNullOrEmpty(collectionID, "String collectionID");
-                
-        String findInconsistentChecksumsSql = "SELECT fileID FROM ("
-                + " SELECT fileID, count(distinct(checksum)) as checksums FROM fileinfo"
-                + " WHERE collectionID = ?"
-                + " GROUP BY fileID) as subselect"
-                + " WHERE checksums > 1";
-        
+
+        String findInconsistentChecksumsSql =
+                "SELECT fileID FROM (" + " SELECT fileID, count(distinct(checksum)) as checksums FROM fileinfo" +
+                        " WHERE collectionID = ?" + " GROUP BY fileID) as subselect" + " WHERE checksums > 1";
+
         return makeIntegrityIssueIterator(findInconsistentChecksumsSql, collectionID);
     }
-    
+
     /**
      * Method that should deliver the database specific SQL for all files at a pillar
+     *
      * @return the database specific SQL for all files at a pillar
      */
     protected abstract String getAllFileIDsSql();
-    
+
     /**
      * Get the files present on a pillar in a given collection
+     *
      * @param collectionID The ID of the collection
-     * @param pillarID The ID of the pillar
-     * @param firstIndex start the iterator at this index. If null, start at 0
-     * @param maxResults the maximum number of results
+     * @param pillarID     The ID of the pillar
+     * @param firstIndex   start the iterator at this index. If null, start at 0
+     * @param maxResults   the maximum number of results
      * @return The iterator with fileIDs present on the pillar in the given collection.
      */
-    public IntegrityIssueIterator getAllFileIDsOnPillar(String collectionID, String pillarID,
-            Long firstIndex, Long maxResults) {
+    public IntegrityIssueIterator getAllFileIDsOnPillar(String collectionID, String pillarID, Long firstIndex, Long maxResults) {
         ArgumentValidator.checkNotNullOrEmpty(collectionID, "String collectionID");
         ArgumentValidator.checkNotNullOrEmpty(pillarID, "String pillarID");
         long first;
-        if(firstIndex == null) {
+        if (firstIndex == null) {
             first = 0;
         } else {
             first = firstIndex;
@@ -356,45 +353,47 @@ public IntegrityIssueIterator getAllFileIDsOnPillar(String collectionID, String
         String getAllFileIDsSql = getAllFileIDsSql();
         return makeIntegrityIssueIterator(getAllFileIDsSql, collectionID, pillarID, first, maxResults);
     }
-    
+
     /**
-     * Method that should deliver the database specific SQL for retrieving the FileID at 
+     * Method that should deliver the database specific SQL for retrieving the FileID at
      * a specific index.
+     *
      * @return The database specific SQL for delivering the FileID at a specific index.
      */
     protected abstract String getFileIdAtIndexSql();
-    
+
     /**
      * Gets the FileID at a given index.
+     *
      * @param collectionID The ID of the collection.
-     * @param index The iterator index for the entry.
+     * @param index        The iterator index for the entry.
      * @return The FileID.
      */
     public String getFileIdAtIndex(String collectionID, Long index) {
         String getSql = getFileIdAtIndexSql();
         return DatabaseUtils.selectFirstStringValue(dbConnector, getSql, collectionID, index, 1);
     }
-    
+
     /**
      * Get the list of FileInfo's for a given file in a given collection
-     * @param fileID The ID of the file
+     *
+     * @param fileID       The ID of the file
      * @param collectionID The ID of the collection
-     * @return The list of FileInfo objects 
+     * @return The list of FileInfo objects
      */
     public List<FileInfo> getFileInfosForFile(String fileID, String collectionID) {
         ArgumentValidator.checkNotNullOrEmpty(fileID, "String fileID");
         ArgumentValidator.checkNotNullOrEmpty(collectionID, "String collectionID");
-        
+
         List<FileInfo> res = new ArrayList<>();
-        String getFileInfoSql = "SELECT pillarID, filesize, checksum, file_timestamp,"
-                + " checksum_timestamp, last_seen_getfileids, last_seen_getchecksums FROM fileinfo"
-                + " WHERE collectionID = ?"
-                + " AND fileID = ?";
-        
+        String getFileInfoSql = "SELECT pillarID, filesize, checksum, file_timestamp," +
+                " checksum_timestamp, last_seen_getfileids, last_seen_getchecksums FROM fileinfo" + " WHERE collectionID = ?" +
+                " AND fileID = ?";
+
         try (Connection conn = dbConnector.getConnection();
              PreparedStatement ps = DatabaseUtils.createPreparedStatement(conn, getFileInfoSql, collectionID, fileID)) {
             try (ResultSet dbResult = ps.executeQuery()) {
-                while(dbResult.next()) {
+                while (dbResult.next()) {
                     Date lastFileCheck = new Date(dbResult.getLong("file_timestamp"));
                     String checksum = dbResult.getString("checksum");
                     Date lastChecksumCheck = new Date(dbResult.getLong("checksum_timestamp"));
@@ -402,208 +401,212 @@ public List<FileInfo> getFileInfosForFile(String fileID, String collectionID) {
                     String pillarID = dbResult.getString("pillarID");
                     Date lastSeenGetFileIDs = new Date(dbResult.getLong("last_seen_getfileids"));
                     Date lastSeenGetChecksums = new Date(dbResult.getLong("last_seen_getchecksums"));
-                    
-                    FileInfo f = new FileInfo(fileID, CalendarUtils.getXmlGregorianCalendar(lastFileCheck), checksum,
-                            fileSize, CalendarUtils.getXmlGregorianCalendar(lastChecksumCheck), pillarID);
+
+                    FileInfo f = new FileInfo(fileID, CalendarUtils.getXmlGregorianCalendar(lastFileCheck), checksum, fileSize,
+                            CalendarUtils.getXmlGregorianCalendar(lastChecksumCheck), pillarID);
                     f.setLastSeenGetFileIDs(lastSeenGetFileIDs);
                     f.setLastSeenGetChecksums(lastSeenGetChecksums);
                     res.add(f);
                 }
-            } 
+            }
         } catch (SQLException e) {
-            throw new IllegalStateException("Could not retrieve the FileInfo for '" + fileID + "' with the SQL '"
-                    + getFileInfoSql + "'.", e);
+            throw new IllegalStateException("Could not retrieve the FileInfo for '" + fileID + "' with the SQL '" + getFileInfoSql + "'.",
+                    e);
         }
         return res;
     }
-    
+
     /**
      * Method to create a new set of statistics entries.
-     * @param collectionID The ID of the collection
+     *
+     * @param collectionID        The ID of the collection
      * @param statisticsCollector The statisticsCollector object containing the data to create
-     * the statistics on
+     *                            the statistics on
      */
     public void createStatistics(String collectionID, StatisticsCollector statisticsCollector) {
         ArgumentValidator.checkNotNullOrEmpty(collectionID, "String collectionID");
         StatisticsCreator sc = new StatisticsCreator(dbConnector.getConnection(), collectionID);
         sc.createStatistics(statisticsCollector);
     }
-    
-    
+
+
     /**
-     * Method to retreives the metrics for the pillars in the given collection
+     * Method to retrieves the metrics for the pillars in the given collection
      * I.e. the summed filesize and file count per pillar
+     *
      * @param collectionID The ID of the collection to get metrics for
-     * @return A mapping between pillars in the collection and the PillarCollectionMetric, 
-     *         the returned map is empty if nothing is found for the collection. Never null.
+     * @return A mapping between pillars in the collection and the PillarCollectionMetric,
+     * the returned map is empty if nothing is found for the collection. Never null.
      */
     public Map<String, PillarCollectionMetric> getPillarCollectionMetrics(String collectionID) {
         Map<String, PillarCollectionMetric> metrics = new HashMap<>();
-        String selectSql = "SELECT pillarID, COUNT(fileID) as filecount, SUM(filesize) as sizesum FROM fileinfo"
-                + " WHERE collectionID = ?"
-                + " GROUP BY pillarID";
-        
+        String selectSql =
+                "SELECT pillarID, COUNT(fileID) as filecount, SUM(filesize) as sizesum FROM fileinfo" + " WHERE collectionID = ?" +
+                        " GROUP BY pillarID";
+
         try (Connection conn = dbConnector.getConnection();
              PreparedStatement ps = DatabaseUtils.createPreparedStatement(conn, selectSql, collectionID);
              ResultSet dbResult = ps.executeQuery()) {
-               while(dbResult.next()) {
-                   String pillarid = dbResult.getString("pillarID");
-                   Long fileCount = dbResult.getLong("filecount");
-                   Long fileSize = dbResult.getLong("sizesum");
-                   PillarCollectionMetric metric = new PillarCollectionMetric(fileSize, fileCount);
-                   metrics.put(pillarid, metric);
-               }
-           } catch (SQLException e) {
-               throw new IllegalStateException("Could not retrieve PillarCollectionMetrics for collection '" 
-                       + collectionID + "' with the SQL '" + selectSql + "'.", e);
-           }
-        
+            while (dbResult.next()) {
+                String pillarid = dbResult.getString("pillarID");
+                Long fileCount = dbResult.getLong("filecount");
+                Long fileSize = dbResult.getLong("sizesum");
+                PillarCollectionMetric metric = new PillarCollectionMetric(fileSize, fileCount);
+                metrics.put(pillarid, metric);
+            }
+        } catch (SQLException e) {
+            throw new IllegalStateException(
+                    "Could not retrieve PillarCollectionMetrics for collection '" + collectionID + "' with the SQL '" + selectSql + "'.",
+                    e);
+        }
+
         return metrics;
     }
-    
+
     /**
      * Get the size of a given collection
+     *
      * @param collectionID The ID of the collection
-     * @return The size of the collection 
+     * @return The size of the collection
      */
     public long getCollectionSize(String collectionID) {
         ArgumentValidator.checkNotNullOrEmpty(collectionID, "String collectionID");
-        
-        String getCollectionSizeSql = "SELECT SUM(filesize) FROM "
-                        + "(SELECT distinct(fileID), filesize from fileinfo"
-                            + " WHERE collectionID = ?) AS subselect";
+
+        String getCollectionSizeSql =
+                "SELECT SUM(filesize) FROM " + "(SELECT distinct(fileID), filesize from fileinfo" + " WHERE collectionID = ?) AS subselect";
         Long size = DatabaseUtils.selectFirstLongValue(dbConnector, getCollectionSizeSql, collectionID);
         return (size == null ? 0 : size);
     }
-    
+
     /**
      * Get the number of files in a given collection
+     *
      * @param collectionID The ID of the collection
-     * @return The number of files in the collection 
+     * @return The number of files in the collection
      */
     public Long getNumberOfFilesInCollection(String collectionID) {
         ArgumentValidator.checkNotNullOrEmpty(collectionID, "String collectionID");
-        
-        String getNumberOfFilesSql = "SELECT COUNT(DISTINCT(fileid)) FROM fileinfo"
-                        + " WHERE collectionID = ?";
-        
+
+        String getNumberOfFilesSql = "SELECT COUNT(DISTINCT(fileid)) FROM fileinfo" + " WHERE collectionID = ?";
+
         return DatabaseUtils.selectFirstLongValue(dbConnector, getNumberOfFilesSql, collectionID);
     }
-    
+
     /**
      * Get the latest pillar statistics for a given collection
+     *
      * @param collectionID The ID of the collection
-     * @return A list of the latest PillarCollectionStat for the given collection 
+     * @return A list of the latest PillarCollectionStat for the given collection
      */
     public List<PillarCollectionStat> getLatestPillarStats(String collectionID) {
         ArgumentValidator.checkNotNullOrEmpty(collectionID, "String collectionID");
         List<PillarCollectionStat> stats = new ArrayList<>();
-        
-        String latestPillarStatsSql = "SELECT pillarID, file_count, file_size, missing_files_count,"
-                + " checksum_errors_count, missing_checksums_count, obsolete_checksums_count"
-                + " FROM pillarstats"
-                + " WHERE stat_key = ("
-                    + " SELECT MAX(stat_key) FROM stats"
-                    + " WHERE collectionID = ?)";
-                
+
+        String latestPillarStatsSql = "SELECT pillarID, file_count, file_size, missing_files_count," +
+                " checksum_errors_count, missing_checksums_count, obsolete_checksums_count" + " FROM pillarstats" + " WHERE stat_key = (" +
+                " SELECT MAX(stat_key) FROM stats" + " WHERE collectionID = ?)";
+
         try (Connection conn = dbConnector.getConnection();
-                PreparedStatement ps = DatabaseUtils.createPreparedStatement(conn, latestPillarStatsSql, collectionID)) {
-               try (ResultSet dbResult = ps.executeQuery()) {
-                   while(dbResult.next()) {
-                       String pillarID = dbResult.getString("pillarID");
-                       Long fileCount = dbResult.getLong("file_count");
-                       Long dataSize = dbResult.getLong("file_size");
-                       Long missingFiles = dbResult.getLong("missing_files_count");
-                       Long checksumErrors = dbResult.getLong("checksum_errors_count");
-                       Long missingChecksums = dbResult.getLong("missing_checksums_count");
-                       Long obsoleteChecksums = dbResult.getLong("obsolete_checksums_count");
-                       Date statsTime = null;
-                       Date updateTime = null;
-                       
-                       
-                       PillarCollectionStat p = new PillarCollectionStat(pillarID, collectionID, fileCount, dataSize, missingFiles, 
-                               checksumErrors, missingChecksums, obsoleteChecksums, statsTime, updateTime);
-                       stats.add(p);
-                   }
-               } 
-           } catch (SQLException e) {
-               throw new IllegalStateException("Could not retrieve the latest PillarCollectionStat's for '" + collectionID + "' " +
-                       "with the SQL '" + latestPillarStatsSql + "'.", e);
-           }        
-        
+             PreparedStatement ps = DatabaseUtils.createPreparedStatement(conn, latestPillarStatsSql, collectionID)) {
+            try (ResultSet dbResult = ps.executeQuery()) {
+                while (dbResult.next()) {
+                    String pillarID = dbResult.getString("pillarID");
+                    Long fileCount = dbResult.getLong("file_count");
+                    Long dataSize = dbResult.getLong("file_size");
+                    Long missingFiles = dbResult.getLong("missing_files_count");
+                    Long checksumErrors = dbResult.getLong("checksum_errors_count");
+                    Long missingChecksums = dbResult.getLong("missing_checksums_count");
+                    Long obsoleteChecksums = dbResult.getLong("obsolete_checksums_count");
+                    Date statsTime = null;
+                    Date updateTime = null;
+
+
+                    PillarCollectionStat p = new PillarCollectionStat(pillarID, collectionID, fileCount, dataSize, missingFiles,
+                            checksumErrors, missingChecksums, obsoleteChecksums, statsTime, updateTime);
+                    stats.add(p);
+                }
+            }
+        } catch (SQLException e) {
+            throw new IllegalStateException(
+                    "Could not retrieve the latest PillarCollectionStat's for '" + collectionID + "' " + "with the SQL '" +
+                            latestPillarStatsSql + "'.", e);
+        }
+
         return stats;
     }
-    
+
     /**
      * Method that should deliver the database specific SQL for getting the latest N collection statistics
+     *
      * @return the database specific SQL for getting the latest N collection statistics
      */
     protected abstract String getLatestCollectionStatsSql();
-    
+
     /**
-     *  Method to get the latest N collection statistics for a given collection
-     *  @param collectionID The ID of the collection to get statistics for
-     *  @param count The maximum number of statistics (N)
-     *  @return The list of CollectionStat's
+     * Method to get the latest N collection statistics for a given collection
+     *
+     * @param collectionID The ID of the collection to get statistics for
+     * @param count        The maximum number of statistics (N)
+     * @return The list of CollectionStat's
      */
     public List<CollectionStat> getLatestCollectionStats(String collectionID, int count) {
         ArgumentValidator.checkNotNullOrEmpty(collectionID, "String collectionID");
         List<CollectionStat> stats = new ArrayList<>();
 
         String latestCollectionStatSql = getLatestCollectionStatsSql();
-        
+
         try (Connection conn = dbConnector.getConnection();
-                PreparedStatement ps = DatabaseUtils.createPreparedStatement(conn, latestCollectionStatSql, collectionID, count)) {
-               try (ResultSet dbResult = ps.executeQuery()) {
-                   while(dbResult.next()) {
-                       Long fileCount = dbResult.getLong("file_count");
-                       Long dataSize = dbResult.getLong("file_size");
-                       Long checksumErrors = dbResult.getLong("checksum_errors_count");
-                       Date latestFile = new Date(dbResult.getLong("latest_file_date"));
-                       Date statsTime = new Date(dbResult.getLong("stat_time"));
-                       Date updateTime = new Date(dbResult.getLong("last_update"));
-                       
-                       CollectionStat stat = new CollectionStat(collectionID, fileCount, dataSize, checksumErrors, 
-                               latestFile, statsTime, updateTime);
-                       stats.add(stat);
-                   }
-               } 
-           } catch (SQLException e) {
-               throw new IllegalStateException("Could not retrieve the latest PillarStat's for '" + collectionID + "' " +
-                       "with the SQL '" + latestCollectionStatSql + "' with arguments '"
-                               + Arrays.asList(collectionID, count) + "'.", e);
-           }
-           java.util.Collections.reverse(stats);
-           return stats;
+             PreparedStatement ps = DatabaseUtils.createPreparedStatement(conn, latestCollectionStatSql, collectionID, count)) {
+            try (ResultSet dbResult = ps.executeQuery()) {
+                while (dbResult.next()) {
+                    Long fileCount = dbResult.getLong("file_count");
+                    Long dataSize = dbResult.getLong("file_size");
+                    Long checksumErrors = dbResult.getLong("checksum_errors_count");
+                    Date latestFile = new Date(dbResult.getLong("latest_file_date"));
+                    Date statsTime = new Date(dbResult.getLong("stat_time"));
+                    Date updateTime = new Date(dbResult.getLong("last_update"));
+
+                    CollectionStat stat = new CollectionStat(collectionID, fileCount, dataSize, checksumErrors, latestFile, statsTime,
+                            updateTime);
+                    stats.add(stat);
+                }
+            }
+        } catch (SQLException e) {
+            throw new IllegalStateException(
+                    "Could not retrieve the latest PillarStat's for '" + collectionID + "' " + "with the SQL '" + latestCollectionStatSql +
+                            "' with arguments '" + Arrays.asList(collectionID, count) + "'.", e);
+        }
+        java.util.Collections.reverse(stats);
+        return stats;
     }
-    
+
     /**
-     *  Method to obtain the earliest date that a file has on any pillar in the specific collection
-     *  @param collectionID The ID of the collection
-     *  @param fileID The ID of the file
-     *  @return the earliest date that a file has on any pillar in the specific collection
+     * Method to obtain the earliest date that a file has on any pillar in the specific collection
+     *
+     * @param collectionID The ID of the collection
+     * @param fileID       The ID of the file
+     * @return the earliest date that a file has on any pillar in the specific collection
      */
     public Date getEarliestFileDate(String collectionID, String fileID) {
         ArgumentValidator.checkNotNullOrEmpty(collectionID, "String collectionID");
         ArgumentValidator.checkNotNullOrEmpty(fileID, "String fileID");
-        
-        String getEarliestFileDateSql = "SELECT MIN(file_timestamp) FROM fileinfo"
-                + " WHERE collectionID = ?"
-                + " AND fileID = ?";
-        long time = DatabaseUtils.selectFirstLongValue(dbConnector, getEarliestFileDateSql, collectionID, fileID);
+
+        String getEarliestFileDateSql = "SELECT MIN(file_timestamp) FROM fileinfo" + " WHERE collectionID = ?" + " AND fileID = ?";
+        long time = Optional.ofNullable(DatabaseUtils.selectFirstLongValue(dbConnector, getEarliestFileDateSql, collectionID, fileID))
+                .orElse(0L);
         return new Date(time);
     }
-    
+
     private IntegrityIssueIterator makeIntegrityIssueIterator(String query, Object... args) {
-        PreparedStatement ps = null;
-        Connection conn = null;
+        PreparedStatement ps;
+        Connection conn;
         try {
             conn = dbConnector.getConnection();
             ps = DatabaseUtils.createPreparedStatement(conn, query, args);
             return new IntegrityIssueIterator(ps);
         } catch (Exception e) {
-            throw new IllegalStateException("Failed to create IntegrityIssueIterator for query '" 
-                    + query + "' with arguments" + Arrays.asList(args), e);
+            throw new IllegalStateException(
+                    "Failed to create IntegrityIssueIterator for query '" + query + "' with arguments" + Arrays.asList(args), e);
         }
     }
 }
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/database/IntegrityDAOFactory.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/database/IntegrityDAOFactory.java
index 8d471af7c..c4e41a72f 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/database/IntegrityDAOFactory.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/database/IntegrityDAOFactory.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -28,13 +28,12 @@
 
 
 /**
- * Factory class to obtain the appropriate type of DAO class for the specified database type 
+ * Factory class to obtain the appropriate type of DAO class for the specified database type
  */
 public class IntegrityDAOFactory extends DatabaseFactory<IntegrityDAO> {
 
     public IntegrityDAO getIntegrityDAOInstance(DatabaseSpecifics ds) {
-        IntegrityDAO dao = getDAOInstance(ds);
-        return dao;
+        return getDAOInstance(ds);
     }
 
     @Override
@@ -51,5 +50,5 @@ protected IntegrityDAO getPostgresDAO(DatabaseManager dm) {
     protected DatabaseManager getDatabaseManager(DatabaseSpecifics ds) {
         return new IntegrityDatabaseManager(ds);
     }
-    
+
 }
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/database/IntegrityDAOUtils.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/database/IntegrityDAOUtils.java
index ffbfbcb60..5a056fce6 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/database/IntegrityDAOUtils.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/database/IntegrityDAOUtils.java
@@ -5,44 +5,43 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.integrityservice.cache.database;
 
-import java.util.List;
-
 import org.bitrepository.common.ArgumentValidator;
 import org.bitrepository.service.database.DBConnector;
 import org.bitrepository.service.database.DatabaseUtils;
 
+import java.util.List;
+
 public class IntegrityDAOUtils {
-    /** The connector to the database.*/
     protected final DBConnector dbConnector;
-    
-    
+
+
     public IntegrityDAOUtils(DBConnector dbConnector) {
         ArgumentValidator.checkNotNull(dbConnector, "DBConnector dbConnector");
         this.dbConnector = dbConnector;
     }
-    
+
     /**
-     *  @return The list of collections defined in the database.
+     * @return The list of collections defined in the database.
      */
     public List<String> retrieveCollectionsInDatabase() {
         String selectSql = "SELECT collectionID FROM collections";
-        return DatabaseUtils.selectStringList(dbConnector, selectSql, new Object[0]);
+        return DatabaseUtils.selectStringList(dbConnector, selectSql);
     }
 
 }
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/database/IntegrityDBStateException.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/database/IntegrityDBStateException.java
index cb528f73e..cd02fa8f8 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/database/IntegrityDBStateException.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/database/IntegrityDBStateException.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -22,11 +22,11 @@
 package org.bitrepository.integrityservice.cache.database;
 
 /**
- * Exception class to indicate that the integritydb has an unexpected state 
+ * Exception class to indicate that the integrity Database has an unexpected state
  */
 @SuppressWarnings("serial")
 public class IntegrityDBStateException extends IllegalStateException {
-    
+
     public IntegrityDBStateException(String message) {
         super(message);
     }
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/database/IntegrityDBTools.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/database/IntegrityDBTools.java
index 2ea99f56c..05feafb83 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/database/IntegrityDBTools.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/database/IntegrityDBTools.java
@@ -5,64 +5,68 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.integrityservice.cache.database;
 
-import java.util.List;
-
 import org.bitrepository.service.database.DBConnector;
 import org.bitrepository.service.database.DatabaseUtils;
 
+import java.util.List;
+
 public class IntegrityDBTools extends IntegrityDAOUtils {
-    
+
     public IntegrityDBTools(DBConnector dbConnector) {
         super(dbConnector);
     }
-   
+
     /**
      * Method to add a new collection to the integrity db.
-     * @param collectionID, the ID of the collection to add. 
-     * @throws IntegrityDBStateException if the collectionID already exist in the DB.  
+     *
+     * @param collectionID, the ID of the collection to add.
+     * @throws IntegrityDBStateException if the collectionID already exist in the DB.
      */
     public void addCollection(String collectionID) throws IntegrityDBStateException {
         List<String> existingCollections = retrieveCollectionsInDatabase();
-        if(existingCollections.contains(collectionID)) {
-            throw new IntegrityDBStateException("Collection '" + collectionID +"' already exists in integrityDB, can't add.");
+        if (existingCollections.contains(collectionID)) {
+            throw new IntegrityDBStateException("Collection '" + collectionID + "' already exists in integrityDB, can't add.");
         }
-        
+
         String sql = "INSERT INTO collections ( collectionID ) VALUES ( ? )";
         DatabaseUtils.executeStatement(dbConnector, sql, collectionID);
-        
+
     }
+
     /**
-     * Method to remove a collectionID from the database. 
-     * The process of removing the collection ID includes removing rows with foreign key references to the collection. 
-     * Thus the tables, files, fileinfo, stats, collectionstats, pillarstats and collections are touched. 
-     * @param collectionID, The ID of the collection to remove. 
+     * Method to remove a collectionID from the database.
+     * The process of removing the collection ID includes removing rows with foreign key references to the collection.
+     * Thus the tables, files, fileinfo, stats, collectionstats, pillarstats and collections are touched.
+     *
+     * @param collectionID, The ID of the collection to remove.
      * @throws IntegrityDBStateException if the collectionID does not already exist in the database
      */
     public void removeCollection(String collectionID) throws IntegrityDBStateException {
         List<String> existingCollections = retrieveCollectionsInDatabase();
-        if(!existingCollections.contains(collectionID)) {
-            throw new IntegrityDBStateException("Collection '" + collectionID +"' is not present in collection, can't remove.");
+        if (!existingCollections.contains(collectionID)) {
+            throw new IntegrityDBStateException("Collection '" + collectionID + "' is not present in collection, can't remove.");
         }
 
         String removeCollectionSql = "DELETE FROM collections WHERE collectionID = ? CASCADE";
-        DatabaseUtils.executeStatement(dbConnector, removeCollectionSql, collectionID);;
-        
+        DatabaseUtils.executeStatement(dbConnector, removeCollectionSql, collectionID);
+        ;
+
     }
-    
+
 }
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/database/IntegrityDatabaseCreator.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/database/IntegrityDatabaseCreator.java
index 498abe049..4b0a65402 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/database/IntegrityDatabaseCreator.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/database/IntegrityDatabaseCreator.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -35,11 +35,11 @@ public class IntegrityDatabaseCreator extends DatabaseCreator {
 
     /**
      * @param args <ol>
-     * <li> The path to the directory containing the settings. See
-     * {@link org.bitrepository.common.settings.XMLFileSettingsLoader} for details.</li>
-     * <li> The database creation script as found in the classpath. Will revert to DEFAULT_INTEGRITY_DB_SCRIPT =
-     * "sql/derby/checksumDBCreation.sql" if null.</li>
-     * </ol>
+     *             <li> The path to the directory containing the settings. See
+     *             {@link org.bitrepository.common.settings.XMLFileSettingsLoader} for details.</li>
+     *             <li> The database creation script as found in the classpath. Will revert to DEFAULT_INTEGRITY_DB_SCRIPT =
+     *             "sql/derby/checksumDBCreation.sql" if null.</li>
+     *             </ol>
      */
     public static void main(String[] args) {
         IntegrityDatabaseCreator dbCreator = new IntegrityDatabaseCreator();
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/database/IntegrityIssueIterator.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/database/IntegrityIssueIterator.java
index 1853b318c..822ce4918 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/database/IntegrityIssueIterator.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/database/IntegrityIssueIterator.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -31,34 +31,34 @@
 import java.sql.SQLException;
 
 /**
- * Class to handle iteration over large set of integrity issues, delivering only IDs 
+ * Class to handle iteration over large set of integrity issues, delivering only IDs
  */
 public class IntegrityIssueIterator implements Closeable {
-    
-    /** The log.*/
-    private Logger log = LoggerFactory.getLogger(getClass());
+    private final Logger log = LoggerFactory.getLogger(getClass());
     private ResultSet issueResultSet = null;
     private Connection conn = null;
     private final PreparedStatement ps;
-    
+
     public IntegrityIssueIterator(PreparedStatement ps) {
         this.ps = ps;
     }
-    
+
     /**
-     * Method to explicitly close the ResultSet in the IntegrityIssueIterator 
+     * Method to explicitly close the ResultSet in the IntegrityIssueIterator
      */
     public void close() {
-        if(issueResultSet != null) {
+        if (issueResultSet != null) {
             try {
                 issueResultSet.close();
-            } catch (SQLException ignored) {}
+            } catch (SQLException ignored) {
+            }
         }
-        
-        if(ps != null) {
+
+        if (ps != null) {
             try {
                 ps.close();
-            } catch (SQLException ignored) {}
+            } catch (SQLException ignored) {
+            }
         }
         try {
             if (conn != null && !conn.isClosed()) {
@@ -66,34 +66,36 @@ public void close() {
                 conn.close();
             }
             conn = null;
-        } catch (SQLException ignored) {}
+        } catch (SQLException ignored) {
+        }
     }
-    
+
     /**
      * Method to return the next AuditTrailEvent in the ResultSet
-     * When no more AuditTrailEvents are available, null is returned and the internal ResultSet closed. 
-     * @return The next AuditTrailEvent available in the ResultSet, or null if no more events are available. 
+     * When no more AuditTrailEvents are available, null is returned and the internal ResultSet closed.
+     *
+     * @return The next AuditTrailEvent available in the ResultSet, or null if no more events are available.
      * @throws IllegalStateException In case of a sql error.
-     * @throws RuntimeException in case the close operation failed
+     * @throws RuntimeException      in case the close operation failed
      */
-    public String getNextIntegrityIssue() throws IllegalStateException, RuntimeException{
+    public String getNextIntegrityIssue() throws IllegalStateException, RuntimeException {
         try {
             String issue = null;
-            if(issueResultSet == null) {
+            if (issueResultSet == null) {
                 conn = ps.getConnection();
                 conn.setAutoCommit(false);
                 ps.setFetchSize(100);
                 long tStart = System.currentTimeMillis();
-                log.debug("Executing query to get issues resultset");
+                log.debug("Executing query to get issues resultSet");
                 issueResultSet = ps.executeQuery();
                 log.debug("Finished executing issues query, it took: " + (System.currentTimeMillis() - tStart) + "ms");
             }
-            if(issueResultSet.next()) {
+            if (issueResultSet.next()) {
                 issue = issueResultSet.getString(1);
             } else {
                 close();
             }
-    
+
             return issue;
         } catch (Exception e) {
             close();
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/database/PostgresIntegrityDAO.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/database/PostgresIntegrityDAO.java
index 241000603..8c985d8ff 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/database/PostgresIntegrityDAO.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/database/PostgresIntegrityDAO.java
@@ -5,30 +5,30 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.integrityservice.cache.database;
 
-import java.util.List;
-
 import org.bitrepository.common.utils.SettingsUtils;
 import org.bitrepository.service.database.DBConnector;
 import org.bitrepository.service.database.DatabaseUtils;
 
+import java.util.List;
+
 /**
- * Class handling the specifics of IntegrityDAO when the database is based on Postgresql 
+ * Class handling the specifics of IntegrityDAO when the database is based on Postgresql
  */
 public class PostgresIntegrityDAO extends IntegrityDAO {
 
@@ -39,68 +39,64 @@ public PostgresIntegrityDAO(DBConnector dbConnector) {
     @Override
     protected synchronized void initializePillars() {
         List<String> pillars = SettingsUtils.getAllPillarIDs();
-        for(String pillar : pillars) {
+        for (String pillar : pillars) {
             String sql = "INSERT INTO pillar (pillarID)"
                     + " (SELECT ? WHERE NOT EXISTS ("
-                            + " SELECT pillarID FROM pillar"
-                            + " WHERE pillarID = ?))";
+                    + " SELECT pillarID FROM pillar"
+                    + " WHERE pillarID = ?))";
             DatabaseUtils.executeStatement(dbConnector, sql, pillar, pillar);
         }
     }
-    
+
     @Override
     protected synchronized void initializeCollections() {
         List<String> collections = SettingsUtils.getAllCollectionsIDs();
-        for(String collection : collections) {
+        for (String collection : collections) {
             String sql = "INSERT INTO collections (collectionID)"
                     + " (SELECT ? WHERE NOT EXISTS ("
-                            + " SELECT collectionID FROM collections"
-                            + " WHERE collectionID = ?))";
+                    + " SELECT collectionID FROM collections"
+                    + " WHERE collectionID = ?))";
             DatabaseUtils.executeStatement(dbConnector, sql, collection, collection);
         }
     }
 
     @Override
     protected String getFindFilesWithMissingCopiesSql() {
-        String findFilesSql = "SELECT fileid FROM fileinfo"
+
+        return "SELECT fileid FROM fileinfo"
                 + " WHERE collectionid = ?"
                 + " GROUP BY fileid"
                 + " HAVING COUNT(fileid) < ?"
                 + " ORDER BY fileid"
                 + " OFFSET ?"
                 + " LIMIT ?";
-
-        return findFilesSql;
     }
 
     @Override
     protected String getAllFileIDsSql() {
-        String getAllFileIDsSql = "SELECT fileID FROM fileinfo"
+        return "SELECT fileID FROM fileinfo"
                 + " WHERE collectionID = ?"
                 + " AND pillarID = ?"
                 + " ORDER BY fileID"
                 + " OFFSET ?"
                 + " LIMIT ?";
-        return getAllFileIDsSql;
     }
 
     @Override
     protected String getLatestCollectionStatsSql() {
-        String latestCollectionStatSql = "SELECT file_count, file_size, checksum_errors_count, latest_file_date,"
+        return "SELECT file_count, file_size, checksum_errors_count, latest_file_date,"
                 + " stat_time, last_update FROM collectionstats"
                 + " JOIN stats ON collectionstats.stat_key = stats.stat_key"
                 + " WHERE stats.collectionID = ?"
                 + " ORDER BY stats.stat_time DESC"
                 + " LIMIT ?";
-        return latestCollectionStatSql;
     }
 
     @Override
     protected String getFileIdAtIndexSql() {
-        String getFileIDAtIndexSql = "SELECT DISTINCT( fileID ) FROM fileinfo"
+        return "SELECT DISTINCT( fileID ) FROM fileinfo"
                 + " WHERE collectionID = ?"
                 + " OFFSET ? "
                 + " LIMIT ?";
-        return getFileIDAtIndexSql;
     }
 }
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/database/StatisticsCreator.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/database/StatisticsCreator.java
index b15a22b3f..cefb53bd9 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/database/StatisticsCreator.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/cache/database/StatisticsCreator.java
@@ -5,28 +5,22 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.integrityservice.cache.database;
 
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.util.Date;
-import java.util.List;
-
 import org.bitrepository.common.utils.SettingsUtils;
 import org.bitrepository.integrityservice.cache.CollectionStat;
 import org.bitrepository.integrityservice.cache.PillarCollectionStat;
@@ -34,46 +28,53 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.util.Date;
+import java.util.List;
+
 /**
  * Class to handle the creation of a new statistics entry.
- * The entries covers the entry point (stat) and detailed statistics for the collection and each of its pillars. 
+ * The entries cover the entry point (stat) and detailed statistics for the collection and each of its pillars.
  */
 public class StatisticsCreator {
 
     private final String insertStatisticEntrySql = "INSERT INTO stats (stat_time, last_update, collectionID)"
             + " VALUES (?, ?, ?)";
-    
+
     private final String insertCollectionStatEntrySql = "INSERT INTO collectionstats"
             + " (stat_key, file_count, file_size, checksum_errors_count, latest_file_date)"
             + " (SELECT MAX(stat_key), ?, ?, ?, ? FROM stats WHERE collectionID = ?)";
-    
+
     private final String insertPillarStatEntrySql = "INSERT INTO pillarstats"
             + " (stat_key, pillarID, file_count, file_size, missing_files_count, "
-                + "checksum_errors_count, missing_checksums_count, obsolete_checksums_count)"
+            + "checksum_errors_count, missing_checksums_count, obsolete_checksums_count)"
             + " (SELECT MAX(stat_key), ?, ?, ?, ?, ?, ?, ? FROM stats WHERE collectionID = ?)";
-    
-    private Logger log = LoggerFactory.getLogger(getClass());
-    
+
+    private final Logger log = LoggerFactory.getLogger(getClass());
+
     private final String collectionID;
     private final Connection conn;
     private PreparedStatement insertStatisticsEntryPS;
     private PreparedStatement insertCollectionStatPS;
     private PreparedStatement insertPillarStatPS;
-    
+
     public StatisticsCreator(Connection dbConnection, String collectionID) {
         this.collectionID = collectionID;
         conn = dbConnection;
     }
-    
+
     private void init() throws SQLException {
         conn.setAutoCommit(false);
         insertStatisticsEntryPS = conn.prepareStatement(insertStatisticEntrySql);
         insertCollectionStatPS = conn.prepareStatement(insertCollectionStatEntrySql);
         insertPillarStatPS = conn.prepareStatement(insertPillarStatEntrySql);
     }
-    
+
     /**
      * Method to handle the actual update.
+     *
      * @param statisticsCollector the statistics collector
      */
     public void createStatistics(StatisticsCollector statisticsCollector) {
@@ -86,10 +87,10 @@ public void createStatistics(StatisticsCollector statisticsCollector) {
                 insertStatisticsEntryPS.setLong(1, statisticsTime.getTime());
                 insertStatisticsEntryPS.setLong(2, now.getTime());
                 insertStatisticsEntryPS.setString(3, collectionID);
-                
+
                 addCollectionStatistics(statisticsCollector.getCollectionStat());
                 List<String> pillars = SettingsUtils.getPillarIDsForCollection(collectionID);
-                for(String pillar : pillars) {
+                for (String pillar : pillars) {
                     addPillarStat(statisticsCollector.getPillarCollectionStat(pillar));
                 }
                 log.debug("Done building statistics batch");
@@ -101,8 +102,8 @@ public void createStatistics(StatisticsCollector statisticsCollector) {
         } catch (SQLException e) {
             log.error("Failed to update files", e);
         }
-    } 
-    
+    }
+
     private void addCollectionStatistics(CollectionStat cs) throws SQLException {
         insertCollectionStatPS.setLong(1, cs.getFileCount());
         insertCollectionStatPS.setLong(2, cs.getDataSize());
@@ -110,7 +111,7 @@ private void addCollectionStatistics(CollectionStat cs) throws SQLException {
         insertCollectionStatPS.setLong(4, cs.getLatestFileTime().getTime());
         insertCollectionStatPS.setString(5, cs.getCollectionID());
     }
-    
+
     private void addPillarStat(PillarCollectionStat ps) throws SQLException {
         insertPillarStatPS.setString(1, ps.getPillarID());
         insertPillarStatPS.setLong(2, ps.getFileCount());
@@ -122,27 +123,26 @@ private void addPillarStat(PillarCollectionStat ps) throws SQLException {
         insertPillarStatPS.setString(8, ps.getCollectionID());
         insertPillarStatPS.addBatch();
     }
-    
-    
-    
+
+
     private void execute() throws SQLException {
         insertStatisticsEntryPS.execute();
         insertCollectionStatPS.execute();
         insertPillarStatPS.executeBatch();
         conn.commit();
     }
-    
+
     private void close() throws SQLException {
-        if(insertStatisticsEntryPS != null) {
-        	insertStatisticsEntryPS.close();
+        if (insertStatisticsEntryPS != null) {
+            insertStatisticsEntryPS.close();
         }
-        if(insertCollectionStatPS != null) {
+        if (insertCollectionStatPS != null) {
             insertCollectionStatPS.close();
         }
-        if(insertPillarStatPS != null) {
+        if (insertPillarStatPS != null) {
             insertPillarStatPS.close();
         }
-        if(conn != null) {
+        if (conn != null) {
             conn.setAutoCommit(true);
             conn.close();
         }
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/checking/MaxChecksumAgeProvider.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/checking/MaxChecksumAgeProvider.java
index 1c10c5d42..454278b38 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/checking/MaxChecksumAgeProvider.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/checking/MaxChecksumAgeProvider.java
@@ -5,27 +5,28 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.integrityservice.checking;
 
-import java.math.BigInteger;
 import org.bitrepository.common.ArgumentValidator;
 import org.bitrepository.settings.referencesettings.MaxChecksumAgeForPillar;
 import org.bitrepository.settings.referencesettings.ObsoleteChecksumSettings;
 
+import java.math.BigInteger;
+
 /**
  * Provide easy access to the MaxChecksumAge for individual pillars.
  */
@@ -46,6 +47,7 @@ public MaxChecksumAgeProvider(long defaultMaxAge, ObsoleteChecksumSettings setti
      *     <li>The ObsoleteChecksumSettings.getDefaultMaxChecksumAge setting if defined</li>
      *     <li>The defaultMaxAge.</li>
      * </ol>
+     *
      * @param pillarID the ID of the pillar
      * @return The MaxChecksumAge for the indicated pillar.
      */
@@ -53,7 +55,7 @@ public long getMaxChecksumAge(String pillarID) {
         ArgumentValidator.checkNotNull(pillarID, "pillarID");
         if (settings != null) {
             if (settings.getMaxChecksumAgeForPillar() != null) {
-                for(MaxChecksumAgeForPillar maxChecksumAgeForPillar:settings.getMaxChecksumAgeForPillar()) {
+                for (MaxChecksumAgeForPillar maxChecksumAgeForPillar : settings.getMaxChecksumAgeForPillar()) {
                     if (pillarID.equals(maxChecksumAgeForPillar.getPillarID())) {
                         return maxChecksumAgeForPillar.getMaxChecksumAge().longValue();
                     }
@@ -68,8 +70,9 @@ public long getMaxChecksumAge(String pillarID) {
 
     /**
      * Provides one line construction of MaxChecksumAgeForPillar objects.
+     *
      * @param pillarID the pillar ID to set
-     * @param value the max checksum age to set
+     * @param value    the max checksum age to set
      * @return a new MaxCheckAgeForPillar Object
      */
     public static MaxChecksumAgeForPillar createMaxChecksumAgeForPillar(String pillarID, long value) {
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/collector/DelegatingIntegrityInformationCollector.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/collector/DelegatingIntegrityInformationCollector.java
index 1b188acb1..8bf76f4e4 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/collector/DelegatingIntegrityInformationCollector.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/collector/DelegatingIntegrityInformationCollector.java
@@ -8,25 +8,22 @@
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.integrityservice.collector;
 
-import java.net.URL;
-import java.util.Collection;
-
 import org.bitrepository.access.ContributorQuery;
 import org.bitrepository.access.getchecksums.GetChecksumsClient;
 import org.bitrepository.access.getfile.GetFileClient;
@@ -38,26 +35,22 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.net.URL;
+import java.util.Collection;
+
 /**
  * Integrity information collector that delegates collecting information to the clients.
  * TODO split into two different collectors. One for collecting the file ids and one for the checksums.
  */
 public class DelegatingIntegrityInformationCollector implements IntegrityInformationCollector {
-    /** The log.*/
-    private Logger log = LoggerFactory.getLogger(getClass());
-
-    /** The client for retrieving file IDs. */
+    private final Logger log = LoggerFactory.getLogger(getClass());
     private final GetFileIDsClient getFileIDsClient;
-    /** The client for retrieving checksums. */
     private final GetChecksumsClient getChecksumsClient;
-    /** The client for performing GetFile operations.*/
     private final GetFileClient getFileClient;
-    /** The client for putting files.*/
     private final PutFileClient putFileClient;
-    /** The audit trail manager.*/
-    
+
     /**
-     * @param getFileIDsClient The client for retrieving file IDs
+     * @param getFileIDsClient   The client for retrieving file IDs
      * @param getChecksumsClient The client for retrieving checksums.
      */
     public DelegatingIntegrityInformationCollector(
@@ -72,8 +65,8 @@ public DelegatingIntegrityInformationCollector(
     }
 
     @Override
-    public synchronized void getFileIDs(String collectionID, Collection<String> pillarIDs, String auditTrailInformation, 
-            ContributorQuery[] queries, EventHandler eventHandler) {
+    public synchronized void getFileIDs(String collectionID, Collection<String> pillarIDs, String auditTrailInformation,
+                                        ContributorQuery[] queries, EventHandler eventHandler) {
         try {
             getFileIDsClient.getFileIDs(collectionID, queries, null, null, eventHandler);
         } catch (Exception e) {
@@ -83,8 +76,9 @@ public synchronized void getFileIDs(String collectionID, Collection<String> pill
     }
 
     @Override
-    public synchronized void getChecksums(String collectionID, Collection<String> pillarIDs, ChecksumSpecTYPE checksumType, 
-            String fileID, String auditTrailInformation, ContributorQuery[] queries, EventHandler eventHandler) {
+    public synchronized void getChecksums(String collectionID, Collection<String> pillarIDs, ChecksumSpecTYPE checksumType,
+                                          String fileID, String auditTrailInformation, ContributorQuery[] queries,
+                                          EventHandler eventHandler) {
         try {
             getChecksumsClient.getChecksums(collectionID, queries, fileID, checksumType, null, eventHandler,
                     auditTrailInformation);
@@ -92,23 +86,24 @@ public synchronized void getChecksums(String collectionID, Collection<String> pi
             log.error("Unexpected failure!", e);
         }
     }
-    
+
     @Override
-    public synchronized void getFile(String collectionID, String fileId, URL uploadUrl, EventHandler eventHandler, 
-            String auditTrailInformation) {
+    public synchronized void getFile(String collectionID, String fileId, URL uploadUrl, EventHandler eventHandler,
+                                     String auditTrailInformation) {
         try {
-            getFileClient.getFileFromFastestPillar(collectionID, fileId, null, uploadUrl, eventHandler, 
+            getFileClient.getFileFromFastestPillar(collectionID, fileId, null, uploadUrl, eventHandler,
                     auditTrailInformation);
         } catch (Exception e) {
             log.error("Unexpected failure!", e);
         }
     }
-    
+
     @Override
-    public synchronized void putFile(String collectionID, String fileId, URL uploadUrl, 
-            ChecksumDataForFileTYPE checksumValidationData, EventHandler eventHandler, String auditTrailInformation) {
+    public synchronized void putFile(String collectionID, String fileId, URL uploadUrl,
+                                     ChecksumDataForFileTYPE checksumValidationData, EventHandler eventHandler,
+                                     String auditTrailInformation) {
         try {
-            putFileClient.putFile(collectionID, uploadUrl, fileId, 0, checksumValidationData, null, eventHandler, 
+            putFileClient.putFile(collectionID, uploadUrl, fileId, 0, checksumValidationData, null, eventHandler,
                     auditTrailInformation);
         } catch (Exception e) {
             log.error("Unexpected failure!", e);
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/collector/IntegrityCollectorEventHandler.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/collector/IntegrityCollectorEventHandler.java
index aca775388..c54c69a98 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/collector/IntegrityCollectorEventHandler.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/collector/IntegrityCollectorEventHandler.java
@@ -5,26 +5,22 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.integrityservice.collector;
 
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.TimeUnit;
-
 import org.bitrepository.access.getchecksums.conversation.ChecksumsCompletePillarEvent;
 import org.bitrepository.access.getfileids.conversation.FileIDsCompletePillarEvent;
 import org.bitrepository.client.eventhandler.ContributorFailedEvent;
@@ -36,92 +32,88 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
+
 /**
- * The eventhandler for the integrity collector.
- * 
- * Notifies the monitor 
+ * The EventHandler for the integrity collector.
+ * <p>
+ * Notifies the monitor
  */
 public class IntegrityCollectorEventHandler implements EventHandler {
-    /** The log.*/
-    private Logger log = LoggerFactory.getLogger(getClass());
-    /** The model where the integrity data is stored.*/
+    private final Logger log = LoggerFactory.getLogger(getClass());
     private final IntegrityModel store;
-    /** The amount of milliseconds before the results are required.*/
     private final long timeout;
-    
-    /** The queue used to store the received operation events. */
     private final BlockingQueue<OperationEvent> finalEventQueue = new LinkedBlockingQueue<>();
-    /** The integrity contributors, keeps track of who have failed, are active or finished */
     private final IntegrityContributors integrityContributors;
-    
+
     /**
-     * Constructor.
-     * @param model The integrity model, where the results of GetChecksums or GetFileIDs are to be delivered.
-     * @param timeout The maximum amount of millisecond to wait for an result.
+     * @param model                 The integrity model, where the results of GetChecksums or GetFileIDs are to be delivered.
+     * @param timeout               The maximum amount of millisecond to wait for an result.
      * @param integrityContributors the integrity contributors
      */
-    public IntegrityCollectorEventHandler(IntegrityModel model, long timeout, 
-            IntegrityContributors integrityContributors) {
+    public IntegrityCollectorEventHandler(IntegrityModel model, long timeout, IntegrityContributors integrityContributors) {
         this.store = model;
         this.timeout = timeout;
         this.integrityContributors = integrityContributors;
     }
-    
+
     @Override
     public void handleEvent(OperationEvent event) {
-        if(event.getEventType() == OperationEventType.COMPONENT_COMPLETE) {
-            log.debug("Component complete: " + event.toString());
+        if (event.getEventType() == OperationEventType.COMPONENT_COMPLETE) {
+            log.debug("Component complete: " + event);
             handleResult(event);
-        } else if(event.getEventType() == OperationEventType.COMPLETE) {
-            log.debug("Complete: " + event.toString());
+        } else if (event.getEventType() == OperationEventType.COMPLETE) {
+            log.debug("Complete: " + event);
             finalEventQueue.add(event);
-        } else if(event.getEventType() == OperationEventType.FAILED) {
-            log.warn("Failure: " + event.toString());
+        } else if (event.getEventType() == OperationEventType.FAILED) {
+            log.warn("Failure: " + event);
             finalEventQueue.add(event);
-        } else if(event.getEventType() == OperationEventType.COMPONENT_FAILED) {
+        } else if (event.getEventType() == OperationEventType.COMPONENT_FAILED) {
             ContributorFailedEvent cfe = (ContributorFailedEvent) event;
             log.warn("Component failure for '" + cfe.getContributorID() + "'.");
             integrityContributors.failContributor(cfe.getContributorID());
         } else {
-            log.debug("Received event: " + event.toString());
+            log.debug("Received event: " + event);
         }
     }
-    
+
     /**
-     * Retrieves the final event when the operation finishes. The final event is awaited for 'timeout' amount 
+     * Retrieves the final event when the operation finishes. The final event is awaited for 'timeout' amount
      * of milliseconds. If no final events has occurred, then an InterruptedException is thrown.
+     *
      * @return The final event.
      * @throws InterruptedException If it timeouts before the final event.
      */
     public OperationEvent getFinish() throws InterruptedException {
         return finalEventQueue.poll(timeout, TimeUnit.MILLISECONDS);
     }
-    
+
     /**
      * Handle the results of the GetChecksums operation at a single pillar.
+     *
      * @param event The event for the completion of a GetChecksums for a single pillar.
      */
     private void handleResult(OperationEvent event) {
-        if(event instanceof ChecksumsCompletePillarEvent) {
+        if (event instanceof ChecksumsCompletePillarEvent) {
             ChecksumsCompletePillarEvent checksumEvent = (ChecksumsCompletePillarEvent) event;
-            log.trace("Receiving GetChecksums result: {}", 
-                    checksumEvent.getChecksums().getChecksumDataItems().toString());
-            store.addChecksums(checksumEvent.getChecksums().getChecksumDataItems(), checksumEvent.getContributorID(), 
+            log.trace("Receiving GetChecksums result: {}", checksumEvent.getChecksums().getChecksumDataItems().toString());
+            store.addChecksums(checksumEvent.getChecksums().getChecksumDataItems(), checksumEvent.getContributorID(),
                     checksumEvent.getCollectionID());
-            if(checksumEvent.isPartialResult()) {
+            if (checksumEvent.isPartialResult()) {
                 integrityContributors.succeedContributor(checksumEvent.getContributorID());
             } else {
                 integrityContributors.finishContributor(checksumEvent.getContributorID());
             }
-        } else if(event instanceof FileIDsCompletePillarEvent) {
-            FileIDsCompletePillarEvent fileidEvent = (FileIDsCompletePillarEvent) event;
-            log.trace("Receiving GetFileIDs result: {}", fileidEvent.getFileIDs().getFileIDsData().toString());
-            store.addFileIDs(fileidEvent.getFileIDs().getFileIDsData(), fileidEvent.getContributorID(),
-                    fileidEvent.getCollectionID());
-            if(fileidEvent.isPartialResult()) {
-                integrityContributors.succeedContributor(fileidEvent.getContributorID());
+        } else if (event instanceof FileIDsCompletePillarEvent) {
+            FileIDsCompletePillarEvent fileIDEvent = (FileIDsCompletePillarEvent) event;
+            log.trace("Receiving GetFileIDs result: {}", fileIDEvent.getFileIDs().getFileIDsData().toString());
+            store.addFileIDs(fileIDEvent.getFileIDs().getFileIDsData(), fileIDEvent.getContributorID(), fileIDEvent.getCollectionID());
+            if (fileIDEvent.isPartialResult()) {
+                integrityContributors.succeedContributor(fileIDEvent.getContributorID());
             } else {
-                integrityContributors.finishContributor(fileidEvent.getContributorID());
+                integrityContributors.finishContributor(fileIDEvent.getContributorID());
             }
         } else {
             log.warn("Unexpected component complete event: " + event.toString());
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/collector/IntegrityEventCompleteAwaiter.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/collector/IntegrityEventCompleteAwaiter.java
index 7b44a2d4a..144a40f89 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/collector/IntegrityEventCompleteAwaiter.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/collector/IntegrityEventCompleteAwaiter.java
@@ -5,26 +5,22 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.integrityservice.collector;
 
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.TimeUnit;
-
 import org.bitrepository.client.eventhandler.EventHandler;
 import org.bitrepository.client.eventhandler.OperationEvent;
 import org.bitrepository.client.eventhandler.OperationEvent.OperationEventType;
@@ -32,41 +28,51 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
+
 /**
  * EventHandler for awaiting an operation to be complete.
  * Just use the 'getFinish()' for awaiting the final event (either FAILURE or COMPLETE).
  */
-public class IntegrityEventCompleteAwaiter implements EventHandler {    
+public class IntegrityEventCompleteAwaiter implements EventHandler {
     private final Logger log = LoggerFactory.getLogger(getClass());
-    /** The amount of milliseconds before the results are required.*/
+    /**
+     * The amount of milliseconds before the results are required.
+     */
     private final Long timeout;
-    
-    /** The queue used to store the received operation events. */
+
+    /**
+     * The queue used to store the received operation events.
+     */
     private final BlockingQueue<OperationEvent> finalEventQueue = new LinkedBlockingQueue<>(1);
 
     /**
      * Constructor.
+     *
      * @param settings The settings.
      */
     public IntegrityEventCompleteAwaiter(Settings settings) {
         this.timeout = settings.getRepositorySettings().getClientSettings().getIdentificationTimeout().longValue()
                 + settings.getRepositorySettings().getClientSettings().getOperationTimeout().longValue();
     }
-    
+
     @Override
     public void handleEvent(OperationEvent event) {
-        if(event.getEventType() == OperationEventType.COMPLETE) {
+        if (event.getEventType() == OperationEventType.COMPLETE) {
             finalEventQueue.add(event);
-        } else if(event.getEventType() == OperationEventType.FAILED) {
+        } else if (event.getEventType() == OperationEventType.FAILED) {
             finalEventQueue.add(event);
         } else {
-            log.debug("Received event: " + event.toString());
+            log.debug("Received event: " + event);
         }
     }
-    
+
     /**
-     * Retrieves the final event when the operation finishes. The final event is awaited for 'timeout' amount 
+     * Retrieves the final event when the operation finishes. The final event is awaited for 'timeout' amount
      * of milliseconds. If no final events has occurred, then an InterruptedException is thrown.
+     *
      * @return The final event.
      */
     public OperationEvent getFinish() {
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/collector/IntegrityInformationCollector.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/collector/IntegrityInformationCollector.java
index a27554d6f..77195da3d 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/collector/IntegrityInformationCollector.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/collector/IntegrityInformationCollector.java
@@ -1,95 +1,97 @@
 /*
  * #%L
  * Bitrepository Integrity Client
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.integrityservice.collector;
 
-import java.net.URL;
-import java.util.Collection;
-
 import org.bitrepository.access.ContributorQuery;
 import org.bitrepository.bitrepositoryelements.ChecksumDataForFileTYPE;
 import org.bitrepository.bitrepositoryelements.ChecksumSpecTYPE;
 import org.bitrepository.client.eventhandler.EventHandler;
 
+import java.net.URL;
+import java.util.Collection;
+
 /**
  * This is the interface for initiating collecting integrity information from pillars.
- *
+ * <p>
  * It is expected to be called from a scheduler that generates events to collect specific data.
  * Results should be stored in the {@link org.bitrepository.integrityservice.cache.IntegrityModel}
- * 
- * The EventHandler given as argument will determine what to do after the collection. 
+ * <p>
+ * The EventHandler given as argument will determine what to do after the collection.
  * E.g. perform a integrity check on the collected data.
  */
 public interface IntegrityInformationCollector {
-    
+
     /**
      * Starts collection the given file ids from the given pillar ids.
-     * @param collectionID The ID of the collection to collect fileIDs from
-     * @param pillarIDs The collection of ids of the pillars to request for the file ids.
+     *
+     * @param collectionID          The ID of the collection to collect fileIDs from
+     * @param pillarIDs             The collection of ids of the pillars to request for the file ids.
      * @param auditTrailInformation The audit trail information for the conversation.
-     * @param queries The limiting contributor queries for the collection of file ids. 
-     * @param eventHandler The eventhandler for the results of the checksum collection. 
+     * @param queries               The limiting contributor queries for the collection of file ids.
+     * @param eventHandler          The EventHandler for the results of the checksum collection.
      */
-    void getFileIDs(String collectionID, Collection<String> pillarIDs, String auditTrailInformation,
-                    ContributorQuery[] queries,
-            EventHandler eventHandler);
+    void getFileIDs(String collectionID, Collection<String> pillarIDs, String auditTrailInformation, ContributorQuery[] queries,
+                    EventHandler eventHandler);
 
     /**
      * Request the specified checksums for from the given pillars.
-     * @param collectionID The ID of the collection to collect checksums from
-     * @param pillarIDs The collection of ids of the pillars to request for the checksums.
-     * @param checksumType The checksum algorithm (and salt) used for the calculation. 
-     * May be null, in which case the collection default is used.
-     * @param fileID The ID of the file to retrieve the checksum. 
-     * May be null, in which case the checksum of all files is collected.
+     *
+     * @param collectionID          The ID of the collection to collect checksums from
+     * @param pillarIDs             The collection of ids of the pillars to request for the checksums.
+     * @param checksumType          The checksum algorithm (and salt) used for the calculation.
+     *                              May be null, in which case the collection default is used.
+     * @param fileID                The ID of the file to retrieve the checksum.
+     *                              May be null, in which case the checksum of all files is collected.
      * @param auditTrailInformation The audit trail information for the conversation.
-     * @param queries The limiting contributor queries for the collection of file ids. 
-     * @param eventHandler The eventhandler for the results of the checksum collection. 
+     * @param queries               The limiting contributor queries for the collection of file ids.
+     * @param eventHandler          The EventHandler for the results of the checksum collection.
      */
-    void getChecksums(String collectionID, Collection<String> pillarIDs, ChecksumSpecTYPE checksumType,
-            String fileID, String auditTrailInformation, ContributorQuery[] queries, EventHandler eventHandler);
-    
+    void getChecksums(String collectionID, Collection<String> pillarIDs, ChecksumSpecTYPE checksumType, String fileID,
+                      String auditTrailInformation, ContributorQuery[] queries, EventHandler eventHandler);
+
     /**
      * Request the specific file to be delivered to a given URL.
-     * @param collectionID The Id of the collection containing the file.
-     * @param fileId The id of the file.
-     * @param uploadUrl The URL for the file to be delivered.
-     * @param eventHandler The eventhandler for the results.
+     *
+     * @param collectionID          The ID of the collection containing the file.
+     * @param fileId                The ID of the file.
+     * @param uploadUrl             The URL for the file to be delivered.
+     * @param eventHandler          The EventHandler for the results.
      * @param auditTrailInformation The audit trail information for the conversation.
      */
-    void getFile(String collectionID, String fileId, URL uploadUrl, EventHandler eventHandler, 
-            String auditTrailInformation);
-    
+    void getFile(String collectionID, String fileId, URL uploadUrl, EventHandler eventHandler, String auditTrailInformation);
+
     /**
-     * Performs the putfile operation.
-     * @param collectionID The id of the collection to put the file.
-     * @param fileId The id of the file to put.
-     * @param uploadUrl The URL for the putfile operation.
+     * Performs the PutFile operation.
+     *
+     * @param collectionID           The id of the collection to put the file.
+     * @param fileId                 The id of the file to put.
+     * @param uploadUrl              The URL for the PutFile operation.
      * @param checksumValidationData The checksum data for validation.
-     * @param eventHandler The eventhandler for the results.
-     * @param auditTrailInformation The audit trail information for the conversation.
+     * @param eventHandler           The EventHandler for the results.
+     * @param auditTrailInformation  The audit trail information for the conversation.
      */
-    void putFile(String collectionID, String fileId, URL uploadUrl, 
-            ChecksumDataForFileTYPE checksumValidationData, EventHandler eventHandler, String auditTrailInformation);
+    void putFile(String collectionID, String fileId, URL uploadUrl, ChecksumDataForFileTYPE checksumValidationData,
+                 EventHandler eventHandler, String auditTrailInformation);
 }
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/collector/SimpleChecksumEventHandler.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/collector/SimpleChecksumEventHandler.java
index b87736857..dd00a3003 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/collector/SimpleChecksumEventHandler.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/collector/SimpleChecksumEventHandler.java
@@ -5,28 +5,22 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.integrityservice.collector;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.TimeUnit;
-
 import org.bitrepository.access.getchecksums.conversation.ChecksumsCompletePillarEvent;
 import org.bitrepository.bitrepositoryelements.ResultingChecksums;
 import org.bitrepository.client.eventhandler.ContributorFailedEvent;
@@ -37,75 +31,75 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
+
 /**
  * Simple eventHandler for retrieving checksum results.
- * 
- * Notifies the monitor 
+ * <p/>
+ * Notifies the monitor
  */
 public class SimpleChecksumEventHandler implements EventHandler {
-    /** The log.*/
-    private Logger log = LoggerFactory.getLogger(getClass());
-    /** The amount of milliseconds before the results are required.*/
+    private final Logger log = LoggerFactory.getLogger(getClass());
     private final long timeout;
-    
-    /** The queue used to store the received operation events. */
     private final BlockingQueue<OperationEvent> finalEventQueue = new LinkedBlockingQueue<>();
-    /** The integrity contributors, keeps track of who have failed, are active or finished */
     private final IntegrityContributors integrityContributors;
-    /** Map between pillars and their checksum results.*/
-    private Map<String, ResultingChecksums> checksumResults = new HashMap<>();
-    
+    private final Map<String, ResultingChecksums> checksumResults = new HashMap<>();
+
     /**
-     * Constructor.
-     * @param timeout The maximum amount of millisecond to wait for an result.
+     * @param timeout               The maximum amount of millisecond to wait for a result.
      * @param integrityContributors the integrity contributors
      */
     public SimpleChecksumEventHandler(long timeout, IntegrityContributors integrityContributors) {
         this.timeout = timeout;
         this.integrityContributors = integrityContributors;
     }
-    
+
     @Override
     public void handleEvent(OperationEvent event) {
-        if(event.getEventType() == OperationEventType.COMPONENT_COMPLETE) {
-            log.debug("Component complete: " + event.toString());
+        if (event.getEventType() == OperationEventType.COMPONENT_COMPLETE) {
+            log.debug("Component complete: " + event);
             handleResult(event);
-        } else if(event.getEventType() == OperationEventType.COMPLETE) {
-            log.debug("Complete: " + event.toString());
+        } else if (event.getEventType() == OperationEventType.COMPLETE) {
+            log.debug("Complete: " + event);
             finalEventQueue.add(event);
-        } else if(event.getEventType() == OperationEventType.FAILED) {
-            log.warn("Failure: " + event.toString());
+        } else if (event.getEventType() == OperationEventType.FAILED) {
+            log.warn("Failure: " + event);
             finalEventQueue.add(event);
-        } else if(event.getEventType() == OperationEventType.COMPONENT_FAILED) {
+        } else if (event.getEventType() == OperationEventType.COMPONENT_FAILED) {
             ContributorFailedEvent cfe = (ContributorFailedEvent) event;
             log.warn("Component failure for '" + cfe.getContributorID() + "'.");
             integrityContributors.failContributor(cfe.getContributorID());
         } else {
-            log.debug("Received event: " + event.toString());
+            log.debug("Received event: " + event);
         }
     }
-    
+
     /**
-     * Retrieves the final event when the operation finishes. The final event is awaited for 'timeout' amount 
+     * Retrieves the final event when the operation finishes. The final event is awaited for 'timeout' amount
      * of milliseconds. If no final events has occurred, then an InterruptedException is thrown.
+     *
      * @return The final event.
      * @throws InterruptedException If it timeouts before the final event.
      */
     public OperationEvent getFinish() throws InterruptedException {
         return finalEventQueue.poll(timeout, TimeUnit.MILLISECONDS);
     }
-    
+
     /**
      * Handle the results of the GetChecksums operation at a single pillar.
+     *
      * @param event The event for the completion of a GetChecksums for a single pillar.
      */
     private void handleResult(OperationEvent event) {
-        if(event instanceof ChecksumsCompletePillarEvent) {
+        if (event instanceof ChecksumsCompletePillarEvent) {
             ChecksumsCompletePillarEvent checksumEvent = (ChecksumsCompletePillarEvent) event;
-            log.trace("Receiving GetChecksums result: {}", 
-                    checksumEvent.getChecksums().getChecksumDataItems().toString());
+            log.trace("Receiving GetChecksums result: {}", checksumEvent.getChecksums().getChecksumDataItems().toString());
             checksumResults.put(checksumEvent.getContributorID(), checksumEvent.getChecksums());
-            if(checksumEvent.isPartialResult()) {
+            if (checksumEvent.isPartialResult()) {
                 integrityContributors.succeedContributor(checksumEvent.getContributorID());
             } else {
                 integrityContributors.finishContributor(checksumEvent.getContributorID());
@@ -114,7 +108,7 @@ private void handleResult(OperationEvent event) {
             log.warn("Unexpected component complete event: " + event.toString());
         }
     }
-    
+
     /**
      * @return The map of the checksum results for each pillar.
      */
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/reports/BasicIntegrityReporter.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/reports/BasicIntegrityReporter.java
index 7ec9638ab..1684c283f 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/reports/BasicIntegrityReporter.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/reports/BasicIntegrityReporter.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -35,129 +35,124 @@ public class BasicIntegrityReporter implements IntegrityReporter {
 
     private final String collectionID;
     private final String workflowType;
-    /** Date of the report, use for identification and for placing it in time. */
-    private final Date reportDate;
     private static final String FS_DATE_FORMAT = "yyyyMMdd-HHmmss";
     private static final String REPORT_DATE_FORMAT = "yyyy/MM/dd HH:mm:ss";
     private Long deletedFilesCount = 0L;
-    //Treemaps ensures alphapetical sorting.
+    // TreeMaps ensures alphabetical sorting.
     private final Map<String, Long> missingFiles = new TreeMap<>();
     private final Map<String, Long> checksumIssues = new TreeMap<>();
     private final Map<String, Long> missingChecksums = new TreeMap<>();
     private final Map<String, Long> obsoleteChecksums = new TreeMap<>();
     private final IntegrityReportWriter writer;
     private final File reportDir;
-    
-    public BasicIntegrityReporter(String collectionID, String workflowType,  File reportsDir) {
+
+    public BasicIntegrityReporter(String collectionID, String workflowType, File reportsDir) {
         this.collectionID = collectionID;
         this.workflowType = workflowType;
-        reportDate = new Date();
+        // Date of the report, use for identification and for placing it in time.
+        Date reportDate = new Date();
         DateFormat formatter = new SimpleDateFormat(FS_DATE_FORMAT, Locale.ROOT);
         File collectionReportsDir = new File(reportsDir, collectionID);
-        if(!collectionReportsDir.isDirectory()) {
+        if (!collectionReportsDir.isDirectory()) {
             collectionReportsDir.mkdir();
         }
         reportDir = new File(collectionReportsDir, formatter.format(reportDate));
         reportDir.mkdir();
         writer = new IntegrityReportWriter(reportDir);
     }
-    
+
     @Override
     public boolean hasIntegrityIssues() {
         return !(
                 missingFiles.isEmpty() &&
-                checksumIssues.isEmpty() &&
-                missingChecksums.isEmpty() &&
-                obsoleteChecksums.isEmpty()
+                        checksumIssues.isEmpty() &&
+                        missingChecksums.isEmpty() &&
+                        obsoleteChecksums.isEmpty()
         );
     }
-    
+
     @Override
     public boolean hasReport() {
         String reportPath = writer.getReportFilePath();
         File report = new File(reportPath);
-        if(report.exists()) {
-            return true;
-        } else {
-            return false;
-        }
+        return report.exists();
     }
-    
+
     @Override
     public File getReportDir() {
         return reportDir;
     }
-    
+
     @Override
     public File getReport() throws FileNotFoundException {
         String reportPath = writer.getReportFilePath();
         File report = new File(reportPath);
-        if(report.exists()) {
+        if (report.exists()) {
             return report;
         } else {
             throw new FileNotFoundException("The report file can't be found on path: " + reportPath);
         }
     }
-    
-    @Override 
+
+    @Override
     public void generateReport() throws IOException {
         DateFormat formatter = new SimpleDateFormat(REPORT_DATE_FORMAT, Locale.ROOT);
         String generatedDate = formatter.format(new Date());
         String reportHead = "######## " + "Integrity report generated by " + workflowType
-                + " for collection: " + collectionID + " on " + generatedDate + " ########"; 
+                + " for collection: " + collectionID + " on " + generatedDate + " ########";
         writer.writeReport(reportHead);
         writer.close();
     }
-    
+
     private String generateSummary() {
         StringBuilder report = new StringBuilder();
-        if(deletedFilesCount != 0L) {
-            report.append("Detected " + deletedFilesCount + " files as removed from the collection.");
+        if (deletedFilesCount != 0L) {
+            report.append("Detected ").append(deletedFilesCount).append(" files as removed from the collection.");
         }
-        for(String pillar : missingFiles.keySet()) {
-            if(missingFiles.get(pillar) != 0) {
-                report.append("\n" + pillar + " is missing " + missingFiles.get(pillar) + " file");
+        for (String pillar : missingFiles.keySet()) {
+            if (missingFiles.get(pillar) != 0) {
+                report.append("\n").append(pillar).append(" is missing ").append(missingFiles.get(pillar)).append(" file");
                 if (missingFiles.get(pillar) > 1) report.append("s");
                 report.append(".");
             }
         }
-        
-        for(String pillar : checksumIssues.keySet()) {
-            if(checksumIssues.get(pillar) != 0) {
-                report.append("\n" + pillar + " has " + checksumIssues.get(pillar) + " potentially corrupt file");
+
+        for (String pillar : checksumIssues.keySet()) {
+            if (checksumIssues.get(pillar) != 0) {
+                report.append("\n").append(pillar).append(" has ").append(checksumIssues.get(pillar)).append(" potentially corrupt file");
                 if (checksumIssues.get(pillar) > 1) report.append("s");
                 report.append(".");
             }
         }
-        
-        for(String pillar : missingChecksums.keySet()) {
-            if(missingChecksums.get(pillar) != 0) {
-                report.append("\n" + pillar + " is missing " + missingChecksums.get(pillar) + " checksum");
+
+        for (String pillar : missingChecksums.keySet()) {
+            if (missingChecksums.get(pillar) != 0) {
+                report.append("\n").append(pillar).append(" is missing ").append(missingChecksums.get(pillar)).append(" checksum");
                 if (missingChecksums.get(pillar) > 1) report.append("s");
                 report.append(".");
             }
         }
-        
-        for(String pillar : obsoleteChecksums.keySet()) {
-            if(obsoleteChecksums.get(pillar) != 0) {
-                report.append("\n" + pillar + " has " + obsoleteChecksums.get(pillar) + " obsolete checksum");
+
+        for (String pillar : obsoleteChecksums.keySet()) {
+            if (obsoleteChecksums.get(pillar) != 0) {
+                report.append("\n").append(pillar).append(" has ").append(obsoleteChecksums.get(pillar)).append(" obsolete checksum");
                 if (obsoleteChecksums.get(pillar) > 1) report.append("s");
                 report.append(".");
             }
         }
-        if(report.toString().isEmpty()) {
+        if (report.toString().isEmpty()) {
             return "No integrity issues found";
         } else {
-            return report.toString();            
+            return report.toString();
         }
     }
 
     @Override
     public String generateSummaryOfReport() {
-        if(!hasIntegrityIssues()) {
+        if (!hasIntegrityIssues()) {
             return "No integrity issues found";
         } else {
-            return "The following integrity issues were found:" +   generateSummary();
+            return "The following integrity issues were found:" + generateSummary();
         }
     }
 
@@ -165,17 +160,17 @@ public String generateSummaryOfReport() {
     public String getCollectionID() {
         return collectionID;
     }
-    
+
     @Override
     public void reportDeletedFile(String pillarID, String fileID) throws IOException {
         deletedFilesCount++;
         writer.writeDeletedFile(pillarID, fileID);
-        
+
     }
 
     @Override
     public void reportMissingFile(String fileID, String pillarID) throws IOException {
-        if(missingFiles.containsKey(pillarID)) {
+        if (missingFiles.containsKey(pillarID)) {
             missingFiles.put(pillarID, (missingFiles.get(pillarID) + 1));
         } else {
             missingFiles.put(pillarID, 1L);
@@ -185,7 +180,7 @@ public void reportMissingFile(String fileID, String pillarID) throws IOException
 
     @Override
     public void reportChecksumIssue(String fileID, String pillarID) throws IOException {
-        if(checksumIssues.containsKey(pillarID)) {
+        if (checksumIssues.containsKey(pillarID)) {
             checksumIssues.put(pillarID, (checksumIssues.get(pillarID) + 1));
         } else {
             checksumIssues.put(pillarID, 1L);
@@ -195,7 +190,7 @@ public void reportChecksumIssue(String fileID, String pillarID) throws IOExcepti
 
     @Override
     public void reportMissingChecksum(String fileID, String pillarID) throws IOException {
-        if(missingChecksums.containsKey(pillarID)) {
+        if (missingChecksums.containsKey(pillarID)) {
             missingChecksums.put(pillarID, (missingChecksums.get(pillarID) + 1));
         } else {
             missingChecksums.put(pillarID, 1L);
@@ -205,7 +200,7 @@ public void reportMissingChecksum(String fileID, String pillarID) throws IOExcep
 
     @Override
     public void reportObsoleteChecksum(String fileID, String pillarID) throws IOException {
-        if(obsoleteChecksums.containsKey(pillarID)) {
+        if (obsoleteChecksums.containsKey(pillarID)) {
             obsoleteChecksums.put(pillarID, (obsoleteChecksums.get(pillarID) + 1));
         } else {
             obsoleteChecksums.put(pillarID, 1L);
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/reports/IntegrityReportConstants.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/reports/IntegrityReportConstants.java
index f9d6a4c4a..65cb2a533 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/reports/IntegrityReportConstants.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/reports/IntegrityReportConstants.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -22,38 +22,41 @@
 package org.bitrepository.integrityservice.reports;
 
 /**
- * Class containing constants related to integrity reports 
+ * Class containing constants related to integrity reports
  */
 public class IntegrityReportConstants {
-    
+
     public enum ReportPart {
         DELETED_FILE {
-            public String getPartname() { return "deletedFile"; }
-            public String getHumanString() { return "deleted files"; }
-        },
-        CHECKSUM_ISSUE {
-            public String getPartname() { return "checksumIssue"; }
-            public String getHumanString() { return "inconsistent checksums"; }
-        },
-        MISSING_CHECKSUM {
-            public String getPartname() { return "missingChecksum"; }
-            public String getHumanString() { return "missing checksums"; }
-        },
-        OBSOLETE_CHECKSUM {
-            public String getPartname() { return "obsoleteChecksum"; }
-            public String getHumanString() { return "obsolete checksums"; }
-        },
-        MISSING_FILE {
-            public String getPartname() { return "missingFile"; }
-            public String getHumanString() { return "missing files"; }
+            public String getPartName() {return "deletedFile";}
+
+            public String getHumanString() {return "deleted files";}
+        }, CHECKSUM_ISSUE {
+            public String getPartName() {return "checksumIssue";}
+
+            public String getHumanString() {return "inconsistent checksums";}
+        }, MISSING_CHECKSUM {
+            public String getPartName() {return "missingChecksum";}
+
+            public String getHumanString() {return "missing checksums";}
+        }, OBSOLETE_CHECKSUM {
+            public String getPartName() {return "obsoleteChecksum";}
+
+            public String getHumanString() {return "obsolete checksums";}
+        }, MISSING_FILE {
+            public String getPartName() {return "missingFile";}
+
+            public String getHumanString() {return "missing files";}
         };
-        public abstract String getPartname();
+
+        public abstract String getPartName();
+
         public abstract String getHumanString();
     }
-    
+
     public static final String REPORT_FILE = "report";
-    
+
     public static final String SECTION_HEADER_START_STOP = "========";
     public static final String PILLAR_HEADER_START_STOP = "--------";
-    public static final String NOISSUE_HEADER_START_STOP = "++++++++";
+    public static final String NO_ISSUE_HEADER_START_STOP = "++++++++";
 }
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/reports/IntegrityReportPartWriter.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/reports/IntegrityReportPartWriter.java
index 577914051..e1e32a02b 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/reports/IntegrityReportPartWriter.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/reports/IntegrityReportPartWriter.java
@@ -5,22 +5,24 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.integrityservice.reports;
 
+import org.bitrepository.integrityservice.reports.IntegrityReportConstants.ReportPart;
+
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -31,11 +33,9 @@
 import java.util.Map;
 import java.util.TreeMap;
 
-import org.bitrepository.integrityservice.reports.IntegrityReportConstants.ReportPart;
-
 /**
- * Class to write files for a specific part of the report. 
- * Files are written as list of fileIDs per component (one file per component) 
+ * Class to write files for a specific part of the report.
+ * Files are written as list of fileIDs per component (one file per component)
  */
 public class IntegrityReportPartWriter {
 
@@ -44,61 +44,64 @@ public class IntegrityReportPartWriter {
     private final Map<String, BufferedWriter> pillarParts = new TreeMap<>();
 
     /**
-     * Constructor
-     * @param part the part to write
-    * @param reportDir The directory to store the files in
+     * @param part      the part to write
+     * @param reportDir The directory to store the files in
      */
     public IntegrityReportPartWriter(ReportPart part, File reportDir) {
         this.part = part;
         this.reportDir = reportDir;
     }
-    
+
     /**
      * Add an issue for a given pillar to its file
-     * @param pillarID The ID of the pillar 
-     * @param fileID The ID of the file that have issues
+     *
+     * @param pillarID The ID of the pillar
+     * @param fileID   The ID of the file that have issues
      * @throws IOException if an I/O error occurs
      */
     public void writeIssue(String pillarID, String fileID) throws IOException {
         BufferedWriter issueWriter;
-        if(!pillarParts.containsKey(pillarID)) {
-            File checksumIssueFile = ReportWriterUtils.makeEmptyFile(reportDir, part.getPartname() + "-" + pillarID);
+        if (!pillarParts.containsKey(pillarID)) {
+            File checksumIssueFile = ReportWriterUtils.makeEmptyFile(reportDir, part.getPartName() + "-" + pillarID);
             issueWriter = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(checksumIssueFile, true), StandardCharsets.UTF_8));
             pillarParts.put(pillarID, issueWriter);
         } else {
-           issueWriter = pillarParts.get(pillarID); 
+            issueWriter = pillarParts.get(pillarID);
         }
-        ReportWriterUtils.addLine(issueWriter, fileID);  
+        ReportWriterUtils.addLine(issueWriter, fileID);
     }
-    
+
     /**
      * Flushes all open files
+     *
      * @throws IOException if an I/O error occurs
      */
     public void flushAll() throws IOException {
-        for(BufferedWriter writer : pillarParts.values()) {
+        for (BufferedWriter writer : pillarParts.values()) {
             writer.flush();
-        } 
+        }
     }
-    
+
     /**
      * Closes all open files
+     *
      * @throws IOException if an I/O error occurs
      */
     public void closeAll() throws IOException {
-        for(BufferedWriter writer : pillarParts.values()) {
+        for (BufferedWriter writer : pillarParts.values()) {
             writer.close();
-        } 
+        }
     }
-    
+
     /**
-     * Get mapping from pillar to the file with the issues.  
+     * Get mapping from pillar to the file with the issues.
+     *
      * @return Mapping between pillarID and the file with the issues for the given pillar.
      */
     public Map<String, File> getSectionFiles() {
         Map<String, File> files = new HashMap<>();
-        for(String part : pillarParts.keySet()) {
-            File f = new File(reportDir, this.part.getPartname() + "-" + part);
+        for (String part : pillarParts.keySet()) {
+            File f = new File(reportDir, this.part.getPartName() + "-" + part);
             files.put(part, f);
         }
         return files;
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/reports/IntegrityReportProvider.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/reports/IntegrityReportProvider.java
index 9ba107bc0..4371a25e4 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/reports/IntegrityReportProvider.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/reports/IntegrityReportProvider.java
@@ -5,99 +5,93 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.integrityservice.reports;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.File;
-import java.io.FileFilter;
 import java.io.FileNotFoundException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
- * Class to handle access to integrity reports 
+ * Class to handle access to integrity reports
  */
 public class IntegrityReportProvider {
-
     private final Logger log = LoggerFactory.getLogger(getClass());
-    private Map<String, IntegrityReportReader> reports = new HashMap<>();
-    
+    private final Map<String, IntegrityReportReader> reports = new HashMap<>();
     private final File reportsDir;
-    
+
     public IntegrityReportProvider(File reportsDir) {
         this.reportsDir = reportsDir;
-        
     }
-    
+
     /**
      * Get the latest access to the latest Integrity report using an IntegrityReportReader
-     * @param collectionID The collection to retrieve the latest report for 
+     *
+     * @param collectionID The collection to retrieve the latest report for
      * @return IntegrityReportReader with the latest integrity report
      * @throws FileNotFoundException if no report could be found
      */
     public synchronized IntegrityReportReader getLatestIntegrityReportReader(String collectionID) throws FileNotFoundException {
         IntegrityReportReader reader = reports.get(collectionID);
-        if(reader == null) {
+        if (reader == null) {
             log.info("Trying to lookup the latest report on disk for collection {}", collectionID);
             File latestReportDir = getLatestReportFromDisk(collectionID);
-            if(latestReportDir != null) {
+            if (latestReportDir != null) {
                 reader = new IntegrityReportReader(latestReportDir);
                 reports.put(collectionID, reader);
             } else {
-                throw new FileNotFoundException("Could not find latest integrity report");    
+                throw new FileNotFoundException("Could not find latest integrity report");
             }
         }
-        
         return reader;
     }
-    
+
     /**
      * Register the latest integrity report for a given collection
+     *
      * @param collectionID The collection to register the report for
-     * @param reportDir The directory containing the integrity report and report parts 
+     * @param reportDir    The directory containing the integrity report and report parts
      */
     public synchronized void setLatestReport(String collectionID, File reportDir) {
         reports.put(collectionID, new IntegrityReportReader(reportDir));
     }
-    
+
     private File getLatestReportFromDisk(String collectionID) {
         File collectionReports = new File(reportsDir, collectionID);
-        log.info("Looking for latest reportdir in {}", collectionReports);
-        File[] reports = collectionReports.listFiles(new FileFilter() {
-            public boolean accept(File file) {
-                return file.isDirectory();
-            }
-        });
+        log.info("Looking for latest report dir in {}", collectionReports);
+        File[] reports = collectionReports.listFiles(File::isDirectory);
         long lastModification = Long.MIN_VALUE;
         File latestReport = null;
-        for(File reportDir : reports) {
-            if(reportDir.lastModified() > lastModification) {
-                File reportFile = new File(reportDir, IntegrityReportConstants.REPORT_FILE); 
-                if(reportFile.exists()) {
+        assert reports != null;
+        for (File reportDir : reports) {
+            if (reportDir.lastModified() > lastModification) {
+                File reportFile = new File(reportDir, IntegrityReportConstants.REPORT_FILE);
+                if (reportFile.exists()) {
                     latestReport = reportDir;
-                    lastModification = latestReport.lastModified();    
+                    lastModification = latestReport.lastModified();
                 } else {
-                    log.debug("Candidate report dir {} had no report file", reportDir);   
+                    log.debug("Candidate report dir {} had no report file", reportDir);
                 }
             }
         }
-                
+
         return latestReport;
     }
 }
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/reports/IntegrityReportReader.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/reports/IntegrityReportReader.java
index 1366f2c05..63cbb8b6c 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/reports/IntegrityReportReader.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/reports/IntegrityReportReader.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -25,33 +25,34 @@
 import java.io.FileNotFoundException;
 
 /**
- * Class to support reading integrity reports and parts of them. 
+ * Class to support reading integrity reports and parts of them.
  */
 public class IntegrityReportReader {
-
     private final File reportDir;
-    
+
     public IntegrityReportReader(File reportDir) {
         this.reportDir = reportDir;
     }
-    
+
     /**
      * Retrieve the full report
+     *
      * @return the full report
      * @throws FileNotFoundException if no report could be found
      */
     public File getFullReport() throws FileNotFoundException {
-         File report = new File(reportDir, IntegrityReportConstants.REPORT_FILE);
-         if(report.exists()) {
-             return report;
-         } else {
-             throw new FileNotFoundException("Could not locate report file");
-         }
+        File report = new File(reportDir, IntegrityReportConstants.REPORT_FILE);
+        if (report.exists()) {
+            return report;
+        } else {
+            throw new FileNotFoundException("Could not locate report file");
+        }
     }
-    
+
     /**
      * Retrieve a part of the report
-     * @param part The part of the report that is requested
+     *
+     * @param part     The part of the report that is requested
      * @param pillarID The pillar for which the part is for
      * @return a part of the report
      * @throws FileNotFoundException if no report part could be found
@@ -59,11 +60,11 @@ public File getFullReport() throws FileNotFoundException {
     public File getReportPart(String part, String pillarID) throws FileNotFoundException {
         String reportFileName = part + "-" + pillarID;
         File reportPart = new File(reportDir, reportFileName);
-        if(reportPart.exists()) {
+        if (reportPart.exists()) {
             return reportPart;
         } else {
             throw new FileNotFoundException("Could not retrieve report part '" + part + "' for '" + pillarID + "'");
         }
     }
-    
+
 }
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/reports/IntegrityReportWriter.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/reports/IntegrityReportWriter.java
index 1a53661ec..23503d7e5 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/reports/IntegrityReportWriter.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/reports/IntegrityReportWriter.java
@@ -5,22 +5,26 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.integrityservice.reports;
 
+import org.bitrepository.integrityservice.reports.IntegrityReportConstants.ReportPart;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.File;
@@ -33,25 +37,19 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Map;
 
-import org.bitrepository.integrityservice.reports.IntegrityReportConstants.ReportPart;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
- * Class to handle writing (streaming) report parts, and generation (writing) of the final report 
+ * Class to handle writing (streaming) report parts, and generation (writing) of the final report
  */
 public class IntegrityReportWriter {
     private static final Logger log = LoggerFactory.getLogger(IntegrityReportWriter.class);
-    
     private final IntegrityReportPartWriter missingFilesWriter;
     private final IntegrityReportPartWriter checksumIssuesWriter;
     private final IntegrityReportPartWriter missingChecksumsWriter;
     private final IntegrityReportPartWriter obsoleteChecksumsWriter;
     private final IntegrityReportPartWriter deletedFilesWriter2;
-    
     private BufferedWriter reportFileWriter;
     private final File reportDir;
-    
+
     public IntegrityReportWriter(File reportDir) {
         this.reportDir = reportDir;
         missingFilesWriter = new IntegrityReportPartWriter(ReportPart.MISSING_FILE, reportDir);
@@ -60,9 +58,10 @@ public IntegrityReportWriter(File reportDir) {
         obsoleteChecksumsWriter = new IntegrityReportPartWriter(ReportPart.OBSOLETE_CHECKSUM, reportDir);
         deletedFilesWriter2 = new IntegrityReportPartWriter(ReportPart.DELETED_FILE, reportDir);
     }
-    
+
     /**
      * Method to retrieve the path to the report file
+     *
      * @return the path to the report file
      */
     public String getReportFilePath() {
@@ -70,62 +69,67 @@ public String getReportFilePath() {
         log.debug("getReportFilePath: Report file located at: " + reportFile.getAbsolutePath());
         return reportFile.getAbsolutePath();
     }
-    
+
     public void writeDeletedFile(String pillarID, String fileID) throws IOException {
         deletedFilesWriter2.writeIssue(pillarID, fileID);
     }
-    
+
     /**
      * Method to handle writing of a checksum issue for a file on a given pillar
+     *
      * @param pillarID The ID of the pillar with a checksum issue
-     * @param fileID The ID of the file which have a checksum issue 
+     * @param fileID   The ID of the file which have a checksum issue
      * @throws IOException if an I/O error occurs
      */
     public void writeChecksumIssue(String pillarID, String fileID) throws IOException {
-        checksumIssuesWriter.writeIssue(pillarID, fileID);    
+        checksumIssuesWriter.writeIssue(pillarID, fileID);
     }
-    
+
     /**
      * Method to handle writing of a missing file entry on a given pillar
+     *
      * @param pillarID The ID of the pillar where the file is missing
-     * @param fileID The ID of the missing file
+     * @param fileID   The ID of the missing file
      * @throws IOException if an I/O error occurs
      */
     public void writeMissingFile(String pillarID, String fileID) throws IOException {
         missingFilesWriter.writeIssue(pillarID, fileID);
     }
-    
+
     /**
      * Method to handle writing of a obsolete checksum entry for a given pillar
+     *
      * @param pillarID The ID of the pillar with the obsolete checksum
-     * @param fileID The ID of the file which have an obsolete checksum 
+     * @param fileID   The ID of the file which have an obsolete checksum
      * @throws IOException if an I/O error occurs
      */
     public void writeObsoleteChecksum(String pillarID, String fileID) throws IOException {
         obsoleteChecksumsWriter.writeIssue(pillarID, fileID);
     }
-    
+
     /**
      * Method to handle writing of a missing checksum entry for a given pillar
+     *
      * @param pillarID The ID of the pillar with the missing checksum
-     * @param fileID The ID of the file missing a checksum 
+     * @param fileID   The ID of the file missing a checksum
      * @throws IOException if an I/O error occurs
      */
     public void writeMissingChecksum(String pillarID, String fileID) throws IOException {
         missingChecksumsWriter.writeIssue(pillarID, fileID);
     }
-    
+
     /**
-     * Method to write the full report. If a report already exists, the old file will be deleted 
+     * Method to write the full report. If a report already exists, the old file will be deleted
      * and a fresh one generated.
+     *
      * @param reportHeader the report header
      * @throws IOException if an I/O error occurs
      */
     public void writeReport(String reportHeader) throws IOException {
         flushAll();
-        if(reportFileWriter == null) {
+        if (reportFileWriter == null) {
             File reportFile = new File(reportDir, IntegrityReportConstants.REPORT_FILE);
-            if(reportFile.exists()) {
+            if (reportFile.exists()) {
                 reportFile.delete();
             }
             reportFileWriter = new BufferedWriter(
@@ -133,24 +137,25 @@ public void writeReport(String reportHeader) throws IOException {
         }
         reportFileWriter.append(reportHeader);
         reportFileWriter.newLine();
-        
+
         writeReportSection(reportFileWriter, deletedFilesWriter2.getSectionFiles(), "Deleted files",
-                "No deleted files detected");        
-        writeReportSection(reportFileWriter, missingFilesWriter.getSectionFiles(), "Missing files", 
+                "No deleted files detected");
+        writeReportSection(reportFileWriter, missingFilesWriter.getSectionFiles(), "Missing files",
                 "No missing files detected");
-        writeReportSection(reportFileWriter, checksumIssuesWriter.getSectionFiles(), "Inconsistent checksums", 
+        writeReportSection(reportFileWriter, checksumIssuesWriter.getSectionFiles(), "Inconsistent checksums",
                 "No inconsistent checksums detected");
-        writeReportSection(reportFileWriter, missingChecksumsWriter.getSectionFiles(), "Missing checksums", 
+        writeReportSection(reportFileWriter, missingChecksumsWriter.getSectionFiles(), "Missing checksums",
                 "No missing checksums detected");
-        writeReportSection(reportFileWriter, obsoleteChecksumsWriter.getSectionFiles(), "Obsolete checksums", 
+        writeReportSection(reportFileWriter, obsoleteChecksumsWriter.getSectionFiles(), "Obsolete checksums",
                 "No obsolete checksums detected");
-        
+
         reportFileWriter.flush();
-        
+
     }
-    
+
     /**
      * Flushes all open files
+     *
      * @throws IOException if an I/O error occurs
      */
     private void flushAll() throws IOException {
@@ -160,65 +165,70 @@ private void flushAll() throws IOException {
         missingFilesWriter.flushAll();
         obsoleteChecksumsWriter.flushAll();
     }
-    
+
     /**
      * Method to close all open writers/streams
      * Only call close after finished using object.
+     *
      * @throws IOException if an I/O error occurs
      */
     public void close() throws IOException {
-        if(reportFileWriter != null) {
+        if (reportFileWriter != null) {
             reportFileWriter.close();
         }
-        
+
         deletedFilesWriter2.closeAll();
         missingChecksumsWriter.closeAll();
         checksumIssuesWriter.closeAll();
         missingFilesWriter.closeAll();
         obsoleteChecksumsWriter.closeAll();
     }
-    
+
     /**
      * Helper method to write the header of a report section
-     * @param report the report writer
+     *
+     * @param report      the report writer
      * @param sectionName the section name
      */
     private void writeSectionHeader(BufferedWriter report, String sectionName) throws IOException {
-        report.append(IntegrityReportConstants.SECTION_HEADER_START_STOP
-                + " " + sectionName + " " + IntegrityReportConstants.SECTION_HEADER_START_STOP);
+        report.append(IntegrityReportConstants.SECTION_HEADER_START_STOP + " ").append(sectionName).append(" ")
+                .append(IntegrityReportConstants.SECTION_HEADER_START_STOP);
         report.newLine();
     }
-    
+
     /**
      * Helper method to write the header of a pillar part of a section
+     *
      * @param report the report writer
      */
     private void writePillarHeader(BufferedWriter report, String pillarName) throws IOException {
-        report.append(IntegrityReportConstants.PILLAR_HEADER_START_STOP 
-                + " " + pillarName + " " + IntegrityReportConstants.PILLAR_HEADER_START_STOP);
+        report.append(IntegrityReportConstants.PILLAR_HEADER_START_STOP + " ").append(pillarName).append(" ")
+                .append(IntegrityReportConstants.PILLAR_HEADER_START_STOP);
         report.newLine();
     }
-    
+
     /**
      * Helper method to write the no-issue header of a section
+     *
      * @param report the report writer
      */
     private void writeNoIssueHeader(BufferedWriter report, String issueMessage) throws IOException {
-        report.append(IntegrityReportConstants.NOISSUE_HEADER_START_STOP 
-                + " " + issueMessage + " " + IntegrityReportConstants.NOISSUE_HEADER_START_STOP);
+        report.append(IntegrityReportConstants.NO_ISSUE_HEADER_START_STOP + " ").append(issueMessage).append(" ")
+                .append(IntegrityReportConstants.NO_ISSUE_HEADER_START_STOP);
         report.newLine();
 
     }
 
     /**
      * Helper method to write the content of a report section
+     *
      * @param report the report writer
      */
-    private void writeReportSection(BufferedWriter report, Map<String, File> sectionData, 
-            String sectionName, String emptyMessage) throws IOException {
+    private void writeReportSection(BufferedWriter report, Map<String, File> sectionData,
+                                    String sectionName, String emptyMessage) throws IOException {
         writeSectionHeader(report, sectionName);
-        if(!sectionData.isEmpty()) {
-            for(String pillar : sectionData.keySet()) {
+        if (!sectionData.isEmpty()) {
+            for (String pillar : sectionData.keySet()) {
                 log.debug("Writing part for pillar: " + pillar);
                 writePillarHeader(report, pillar);
                 writeSectionPart(report, sectionData.get(pillar));
@@ -227,9 +237,10 @@ private void writeReportSection(BufferedWriter report, Map<String, File> section
             writeNoIssueHeader(reportFileWriter, emptyMessage);
         }
     }
-    
+
     /**
      * Helper method to read the actual content and write it back to the combined report file.
+     *
      * @param report the report writer
      */
     private void writeSectionPart(BufferedWriter report, File partData) throws FileNotFoundException {
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/reports/IntegrityReporter.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/reports/IntegrityReporter.java
index 50c30c799..644b6096c 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/reports/IntegrityReporter.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/reports/IntegrityReporter.java
@@ -1,23 +1,23 @@
 /*
  * #%L
  * Bitrepository Integrity Client
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -33,86 +33,96 @@
  */
 public interface IntegrityReporter {
     /**
-     * @return Whether the integrity check gave a positive result. E.g. returns false, if any integrity problems 
+     * @return Whether the integrity check gave a positive result. E.g. returns false, if any integrity problems
      * occurred (whether any files were missing, any disagreements about checksum, etc.).
      */
     boolean hasIntegrityIssues();
-    
+
     /**
      * Method to test if a report is available
-     * @return true if an integrity report is available.  
+     *
+     * @return true if an integrity report is available.
      */
     boolean hasReport();
-    
+
     /**
-     * Method to get the directory where the report is stored.  
+     * Method to get the directory where the report is stored.
      */
     File getReportDir();
-    
+
     /**
-     * Retrieves the written report 
+     * Retrieves the written report
+     *
      * @throws FileNotFoundException if no report is found
      */
     File getReport() throws FileNotFoundException;
-    
-    /** 
-     * Creates the human readable report for the entire integrity issue.
+
+    /**
+     * Creates the human-readable report for the entire integrity issue.
      * This involves all the specifics, e.g. at single file-level.
-     * @throws IOException 
+     *
+     * @throws IOException Throws an IOException if any error occur.
      */
     void generateReport() throws IOException;
-    
+
     /**
-     * Create a human readable summary of the integrity issue.
+     * Create a human-readable summary of the integrity issue.
      * Should only contain the overall issue description, not specifics.
+     *
      * @return The summary of the integrity issue.
      */
     String generateSummaryOfReport();
-    
+
     /**
-     * Return the ID of the collection that the report is about. 
+     * Return the ID of the collection that the report is about.
+     *
      * @return The collectionID
      */
     String getCollectionID();
-    
+
     /**
-     * Report that a file has been deleted from the collection. Note this is not considered a integrity issue.
+     * Report that a file has been deleted from the collection. Note this is not considered an integrity issue.
+     *
      * @param pillarID The  ID of the pillar on which the file was removed
-     * @param fileID The ID of the file that has been removed 
+     * @param fileID   The ID of the file that has been removed
      * @throws IOException if writing fails
      */
     void reportDeletedFile(String pillarID, String fileID) throws IOException;
-    
+
     /**
-     * Report that a file is missing from a pillar 
-     * @param fileID The ID of the file that is missing
-     * @param pillarID The ID of the pillar that the file is missing on. 
-     * @throws IOException 
+     * Report that a file is missing from a pillar
+     *
+     * @param fileID   The ID of the file that is missing
+     * @param pillarID The ID of the pillar that the file is missing on.
+     * @throws IOException Throws an IOException if any error occur.
      */
     void reportMissingFile(String fileID, String pillarID) throws IOException;
-    
+
     /**
      * Report that a file have a checksum issues on a given pillar
-     * @param fileID The ID of the file that has a checksum issue
-     * @param pillarID The ID of the pillar with the checksum issue 
-     * @throws IOException 
+     *
+     * @param fileID   The ID of the file that has a checksum issue
+     * @param pillarID The ID of the pillar with the checksum issue
+     * @throws IOException Throws an IOException if any error occur.
      */
     void reportChecksumIssue(String fileID, String pillarID) throws IOException;
-    
+
     /**
-     *  Report that a file is missing a checksum on a given pillar
-     *  @param fileID The ID of the file that is missing a checksum
-     *  @param pillarID The ID of the pillar that does not have the checksum for the file
-     * @throws IOException 
+     * Report that a file is missing a checksum on a given pillar
+     *
+     * @param fileID   The ID of the file that is missing a checksum
+     * @param pillarID The ID of the pillar that does not have the checksum for the file
+     * @throws IOException Throws an IOException if any error occur.
      */
     void reportMissingChecksum(String fileID, String pillarID) throws IOException;
-    
+
     /**
-     * Report that a file have an obsolete checksum on a given pillar 
-     * @param fileID The ID of the file with the obsolete checksum
+     * Report that a file have an obsolete checksum on a given pillar
+     *
+     * @param fileID   The ID of the file with the obsolete checksum
      * @param pillarID The ID of the pillar that have the obsolete checksum
-     * @throws IOException 
+     * @throws IOException Throws an IOException if any error occur.
      */
     void reportObsoleteChecksum(String fileID, String pillarID) throws IOException;
-    
+
 }
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/reports/ReportWriterUtils.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/reports/ReportWriterUtils.java
index 3bf44e757..9a7b21a14 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/reports/ReportWriterUtils.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/reports/ReportWriterUtils.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -29,35 +29,37 @@
 
 
 /**
- * Utility class for helper methods for writing report files 
+ * Utility class for helper methods for writing report files
  */
 public class ReportWriterUtils {
-    
+
     /**
      * Creates a File object, and makes sure that it's empty. I.e. deletes the old file if present on disk.
      * <p>
      * Please remember that there is nothing stopping some other thread from deleting your file
-     * @param dir the dir in which to create the file
+     *
+     * @param dir      the dir in which to create the file
      * @param fileName the filename
-     * @return a brand new File object, ready for use
-     * @throws IOException if the file already existed and the delete failed
+     * @return a brand-new File object, ready for use
+     * @throws IOException if the file already existed and the delete operation failed
      */
     public static File makeEmptyFile(File dir, String fileName) throws IOException {
         Path file = dir.toPath().resolve(fileName);
         Files.deleteIfExists(file);
         return file.toFile();
     }
-    
+
     /**
-     * Helper method to add an entry to a partial report file. 
+     * Helper method to add an entry to a partial report file.
      * Writes the line, adds a new line, and flushes to disk.
+     *
      * @param writer the writer to write to
-     * @param line the line to write
+     * @param line   the line to write
      * @throws IOException if the writer cannot write
      */
     public static void addLine(BufferedWriter writer, String line) throws IOException {
         writer.append(line);
         writer.newLine();
-        writer.flush(); 
+        writer.flush();
     }
 }
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/statistics/StatisticsCollector.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/statistics/StatisticsCollector.java
index 3e025d39f..49b3dfa61 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/statistics/StatisticsCollector.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/statistics/StatisticsCollector.java
@@ -5,51 +5,51 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.integrityservice.statistics;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 import org.bitrepository.common.utils.SettingsUtils;
 import org.bitrepository.integrityservice.cache.CollectionStat;
 import org.bitrepository.integrityservice.cache.PillarCollectionStat;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 public class StatisticsCollector {
 
     final CollectionStat collectionStat;
     final Map<String, PillarCollectionStat> pillarCollectionStats;
-    
+
     public StatisticsCollector(String collectionID) {
         collectionStat = new CollectionStat(collectionID);
         pillarCollectionStats = new HashMap<>();
         List<String> pillars = SettingsUtils.getPillarIDsForCollection(collectionID);
-        for(String pillar : pillars) {
+        for (String pillar : pillars) {
             PillarCollectionStat ps = new PillarCollectionStat(pillar, collectionID);
             pillarCollectionStats.put(pillar, ps);
         }
     }
-    
+
     public CollectionStat getCollectionStat() {
         return collectionStat;
     }
-    
+
     public PillarCollectionStat getPillarCollectionStat(String pillarID) {
         return pillarCollectionStats.get(pillarID);
     }
-    
+
 }
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/tools/CollectionsAdmin.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/tools/CollectionsAdmin.java
index 322d6b27f..7a212eb5d 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/tools/CollectionsAdmin.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/tools/CollectionsAdmin.java
@@ -5,24 +5,22 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.integrityservice.tools;
 
-import java.util.List;
-
 import org.bitrepository.common.settings.Settings;
 import org.bitrepository.common.settings.XMLFileSettingsLoader;
 import org.bitrepository.common.utils.SettingsUtils;
@@ -31,50 +29,52 @@
 import org.bitrepository.service.database.DBConnector;
 import org.bitrepository.settings.referencesettings.ServiceType;
 
+import java.util.List;
+
 /**
- * Class to handle removal and additions of colletions in the integrityDB 
+ * Class to handle removal and additions of collections in the integrityDB
  */
 public class CollectionsAdmin {
-
     private final String collectionID;
-    private final Settings settings;
     IntegrityDBTools tools;
-    
+
     public CollectionsAdmin(String collectionID, String pathToSettings) {
         this.collectionID = collectionID;
-        
+
         ServiceSettingsProvider settingsLoader =
                 new ServiceSettingsProvider(new XMLFileSettingsLoader(pathToSettings), ServiceType.INTEGRITY_SERVICE);
-        settings = settingsLoader.getSettings();
+        Settings settings = settingsLoader.getSettings();
         SettingsUtils.initialize(settings);
         tools = new IntegrityDBTools(new DBConnector(settings.getReferenceSettings().getIntegrityServiceSettings().getIntegrityDatabase()));
     }
-    
+
     /**
      * Method to run the requested action on the database. Checks to see if the requested actions is supported.
      * And if we can operate on the requested collectionID
+     *
      * @param method The method to invoke, allowed values 'add' or 'remove'
-     * @throws InvalidMethodException if the method/action is not supported
-     * @throws UnknownCollectionException if the requested collectionID is not found in settings. 
+     * @throws InvalidMethodException     if the method/action is not supported
+     * @throws UnknownCollectionException if the requested collectionID is not found in settings.
      */
     public void invoke(String method) throws InvalidMethodException, UnknownCollectionException {
         hasCollection();
-        if(method.equals("add")) {
+        if (method.equals("add")) {
             tools.addCollection(collectionID);
-        } else if(method.equals("remove")) {
+        } else if (method.equals("remove")) {
             tools.removeCollection(collectionID);
         } else {
             throw new InvalidMethodException("The method '" + method + "' is not supported, use: 'remove' or 'add'.");
         }
     }
-    
+
     /**
-     * Method to determine if a collection is present in the RepositorySettings. 
-     * @throws UnknownCollectionException if the collection is not present 
+     * Method to determine if a collection is present in the RepositorySettings.
+     *
+     * @throws UnknownCollectionException if the collection is not present
      */
     private void hasCollection() throws UnknownCollectionException {
         List<String> collections = SettingsUtils.getAllCollectionsIDs();
-        if(!collections.contains(collectionID)) {
+        if (!collections.contains(collectionID)) {
             throw new UnknownCollectionException("The collection '" + collectionID + "' is not present in RepositorySettings");
         }
     }
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/tools/CollectionsAdminLauncher.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/tools/CollectionsAdminLauncher.java
index fcc45314d..332c5d61c 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/tools/CollectionsAdminLauncher.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/tools/CollectionsAdminLauncher.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -22,30 +22,26 @@
 package org.bitrepository.integrityservice.tools;
 
 /**
- * Class to handle launching of CollectionsAdmin 
+ * Class to handle launching of CollectionsAdmin
  */
 public class CollectionsAdminLauncher {
-
-    
     public static void main(String[] args) {
-        if(!(args.length == 3)) {
+        if (!(args.length == 3)) {
             printUsage();
             System.exit(1);
         }
         String method = args[0];
         String collectionID = args[1];
         String settingsPath = args[2];
-        
+
         CollectionsAdmin ca = new CollectionsAdmin(collectionID, settingsPath);
         try {
             ca.invoke(method);
-        } catch (UnknownCollectionException e) {
-            System.out.println(e.getMessage());
-        } catch (InvalidMethodException e) {
+        } catch (UnknownCollectionException | InvalidMethodException e) {
             System.out.println(e.getMessage());
         }
     }
-    
+
     private static void printUsage() {
         System.out.println("Usage: collectionAdmin.sh <method> <collectionID> <path-to-settings>");
         System.out.println("Supported methods: add | remove");
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/tools/InvalidMethodException.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/tools/InvalidMethodException.java
index f396d5dc2..8cdb30e88 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/tools/InvalidMethodException.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/tools/InvalidMethodException.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -22,13 +22,12 @@
 package org.bitrepository.integrityservice.tools;
 
 /**
- * Exception class to indicate an invalid method.  
+ * Exception class to indicate an invalid method.
  */
 @SuppressWarnings("serial")
 public class InvalidMethodException extends IllegalStateException {
-
     public InvalidMethodException(String message) {
         super(message);
     }
-    
+
 }
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/tools/UnknownCollectionException.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/tools/UnknownCollectionException.java
index 1e1405b26..c7b768c71 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/tools/UnknownCollectionException.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/tools/UnknownCollectionException.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -22,11 +22,10 @@
 package org.bitrepository.integrityservice.tools;
 
 /**
- * Exception class to indicate unknown collection 
+ * Exception class to indicate unknown collection
  */
 @SuppressWarnings("serial")
 public class UnknownCollectionException extends IllegalStateException {
-    
     public UnknownCollectionException(String message) {
         super(message);
     }
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/web/IntegrityServiceContextListener.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/web/IntegrityServiceContextListener.java
index 7d1a60316..33d9d4626 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/web/IntegrityServiceContextListener.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/web/IntegrityServiceContextListener.java
@@ -1,23 +1,23 @@
 /*
  * #%L
  * Bitrepository Integrity Client
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -32,7 +32,6 @@
  * The context listener for the Integrity service.
  */
 public class IntegrityServiceContextListener extends AbstractBitrepositoryContextListener {
-
     @Override
     public String getSettingsParameter() {
         return "integrityServiceConfDir";
@@ -46,5 +45,5 @@ public LifeCycledService getService() {
     @Override
     public void initialize(String configurationDir) {
         IntegrityServiceManager.initialize(configurationDir);
-    }    
+    }
 }
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/web/JSONStreamingTools.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/web/JSONStreamingTools.java
index e42962314..c1a01c993 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/web/JSONStreamingTools.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/web/JSONStreamingTools.java
@@ -5,115 +5,109 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.integrityservice.web;
 
+import com.fasterxml.jackson.core.JsonEncoding;
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.JsonGenerator;
+import org.bitrepository.integrityservice.cache.database.IntegrityIssueIterator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.StreamingOutput;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.IOException;
 import java.io.InputStreamReader;
-import java.io.OutputStream;
 import java.nio.charset.StandardCharsets;
 
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.StreamingOutput;
-
-import org.bitrepository.integrityservice.cache.database.IntegrityIssueIterator;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.fasterxml.jackson.core.JsonEncoding;
-import com.fasterxml.jackson.core.JsonFactory;
-import com.fasterxml.jackson.core.JsonGenerator;
-
 /**
- * Class to handle streaming of different kinds of JSON data 
+ * Class to handle streaming of different kinds of JSON data
  */
 public class JSONStreamingTools {
     private final static Logger log = LoggerFactory.getLogger(JSONStreamingTools.class);
-    
+
     /**
      * Helper method to stream integrity issues as JSON for webservices.
-     * @param iterator The IntegrityIssueIterator with integrity issues that is to be streamed out.   
+     *
+     * @param iterator The IntegrityIssueIterator with integrity issues that is to be streamed out.
      */
     public static StreamingOutput StreamIntegrityIssues(IntegrityIssueIterator iterator) {
         final IntegrityIssueIterator it = iterator;
-        return new StreamingOutput() {
-            public void write(OutputStream output) throws IOException, WebApplicationException {
-                JsonFactory jf = new JsonFactory();
-                JsonGenerator jg = jf.createGenerator(output, JsonEncoding.UTF8);
+        return output -> {
+            JsonFactory jf = new JsonFactory();
+            JsonGenerator jg = jf.createGenerator(output, JsonEncoding.UTF8);
+            try {
+                jg.writeStartArray();
+                String issue;
+                while ((issue = it.getNextIntegrityIssue()) != null) {
+                    jg.writeString(issue);
+                }
+                jg.writeEndArray();
+                jg.flush();
+                jg.close();
+            } catch (Exception e) {
+                throw new WebApplicationException(e);
+            } finally {
                 try {
-                    jg.writeStartArray();
-                    String issue;
-                    while((issue = it.getNextIntegrityIssue()) != null) {
-                        jg.writeString(issue);
+                    if (it != null) {
+                        it.close();
                     }
-                    jg.writeEndArray();
-                    jg.flush();
-                    jg.close();
                 } catch (Exception e) {
+                    log.error("Caught execption when closing IntegrityIssueIterator", e);
                     throw new WebApplicationException(e);
-                } finally {
-                    try {
-                        if(it != null) {
-                            it.close();
-                        }
-                    } catch (Exception e) {
-                        log.error("Caught execption when closing IntegrityIssueIterator", e);
-                        throw new WebApplicationException(e);
-                    }
                 }
             }
         };
     }
-    
+
     /**
      * Helper method to stream whole or parts of a files content as a JSON formatted list
      * (one list entry per line)
-     * @param source The source file
-     * @param offset The number of lines to skip
-     * @param maxlines The maximum number of lines to output 
+     *
+     * @param source   The source file
+     * @param offset   The number of lines to skip
+     * @param maxlines The maximum number of lines to output
      */
     public static StreamingOutput StreamFileParts(File source, int offset, int maxlines) {
         final File input = source;
-        return new StreamingOutput() {
-            public void write(OutputStream output) throws IOException, WebApplicationException {
-                JsonFactory jf = new JsonFactory();
-                JsonGenerator jg = jf.createGenerator(output, JsonEncoding.UTF8);
-                
-                try (BufferedReader b = new BufferedReader(new InputStreamReader(new FileInputStream(input), StandardCharsets.UTF_8))) {
-                    int linesRead = 0;
-                    jg.writeStartArray();
-                    String line;
-                    while((line = b.readLine()) != null) {
-                        if(linesRead++ < offset) {
-                            continue;
-                        }
-                        jg.writeString(line);
-                        if(linesRead - offset >= maxlines) {
-                            break;
-                        }
+        return output -> {
+            JsonFactory jf = new JsonFactory();
+            JsonGenerator jg = jf.createGenerator(output, JsonEncoding.UTF8);
+
+            try (BufferedReader b = new BufferedReader(new InputStreamReader(new FileInputStream(input), StandardCharsets.UTF_8))) {
+                int linesRead = 0;
+                jg.writeStartArray();
+                String line;
+                while ((line = b.readLine()) != null) {
+                    if (linesRead++ < offset) {
+                        continue;
+                    }
+                    jg.writeString(line);
+                    if (linesRead - offset >= maxlines) {
+                        break;
                     }
-                    jg.writeEndArray();
-                    jg.flush();
-                    jg.close();
-                } catch (Exception e) {
-                    throw new WebApplicationException(e);
                 }
+                jg.writeEndArray();
+                jg.flush();
+                jg.close();
+            } catch (Exception e) {
+                throw new WebApplicationException(e);
             }
         };
     }
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/web/RestIntegrityService.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/web/RestIntegrityService.java
index 57ca4a37e..895507a1a 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/web/RestIntegrityService.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/web/RestIntegrityService.java
@@ -1,54 +1,31 @@
 /*
  * #%L
  * Bitrepository Integrity Client
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.integrityservice.web;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.StreamingOutput;
-
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.JsonGenerator;
 import org.bitrepository.common.utils.FileSizeUtils;
 import org.bitrepository.common.utils.SettingsUtils;
 import org.bitrepository.common.utils.TimeUtils;
@@ -67,17 +44,35 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.fasterxml.jackson.core.JsonFactory;
-import com.fasterxml.jackson.core.JsonGenerationException;
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonProcessingException;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DefaultValue;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.StreamingOutput;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @Path("/IntegrityService")
 public class RestIntegrityService {
     private final Logger log = LoggerFactory.getLogger(getClass());
-    private IntegrityModel model;
-    private WorkflowManager workflowManager;
-    private IntegrityReportProvider integrityReportProvider;
+    private final IntegrityModel model;
+    private final WorkflowManager workflowManager;
+    private final IntegrityReportProvider integrityReportProvider;
 
     public RestIntegrityService() {
         this.model = IntegrityServiceManager.getIntegrityModel();
@@ -86,147 +81,177 @@ public RestIntegrityService() {
     }
 
     /**
-     * Method to get the checksum errors per pillar in a given collection. 
+     * Method to get the checksum errors per pillar in a given collection.
+     *
      * @param collectionID, the collectionID from which to return checksum errors
-     * @param pillarID, the ID of the pillar in the collection from which to return checksum errors
-     * @param pageNumber, the page number for calculating offsets (@see pageSize)
-     * @param pageSize, the number of checksum errors per page. 
+     * @param pillarID,     the ID of the pillar in the collection from which to return checksum errors
+     * @param pageNumber,   the page number for calculating offsets (@see pageSize)
+     * @param pageSize,     the number of checksum errors per page.
      */
     @GET
     @Path("/getChecksumErrorFileIDs/")
     @Produces(MediaType.APPLICATION_JSON)
     public StreamingOutput getChecksumErrors(
-            @QueryParam("collectionID") String collectionID,
-            @QueryParam("pillarID") String pillarID,
-            @QueryParam("pageNumber") int pageNumber,
-            @DefaultValue("100") @QueryParam("pageSize") int pageSize) {
-        
+            @QueryParam("collectionID")
+                    String collectionID,
+            @QueryParam("pillarID")
+                    String pillarID,
+            @QueryParam("pageNumber")
+                    int pageNumber,
+            @DefaultValue("100")
+            @QueryParam("pageSize")
+                    int pageSize) {
+
         int firstID = (pageNumber - 1) * pageSize;
 
         return streamPartFromLatestReport(ReportPart.CHECKSUM_ISSUE, collectionID, pillarID, firstID, pageSize);
     }
-    
+
     /**
-     * Method to get the list of missing files per pillar in a given collection. 
+     * Method to get the list of missing files per pillar in a given collection.
+     *
      * @param collectionID, the collectionID from which to return missing files
-     * @param pillarID, the ID of the pillar in the collection from which to return missing files
-     * @param pageNumber, the page number for calculating offsets (@see pageSize)
-     * @param pageSize, the number of checksum errors per page. 
+     * @param pillarID,     the ID of the pillar in the collection from which to return missing files
+     * @param pageNumber,   the page number for calculating offsets (@see pageSize)
+     * @param pageSize,     the number of checksum errors per page.
      */
     @GET
     @Path("/getMissingFileIDs/")
     @Produces(MediaType.APPLICATION_JSON)
     public StreamingOutput getMissingFileIDs(
-            @QueryParam("collectionID") String collectionID,
-            @QueryParam("pillarID") String pillarID,
-            @QueryParam("pageNumber") int pageNumber,
-            @DefaultValue("100") @QueryParam("pageSize") int pageSize) {
-        
+            @QueryParam("collectionID")
+                    String collectionID,
+            @QueryParam("pillarID")
+                    String pillarID,
+            @QueryParam("pageNumber")
+                    int pageNumber,
+            @DefaultValue("100")
+            @QueryParam("pageSize")
+                    int pageSize) {
+
         int firstID = (pageNumber - 1) * pageSize;
-                
+
         return streamPartFromLatestReport(ReportPart.MISSING_FILE, collectionID, pillarID, firstID, pageSize);
     }
-    
+
     /**
-     * Method to get the list of missing checksums per pillar in a given collection. 
+     * Method to get the list of missing checksums per pillar in a given collection.
+     *
      * @param collectionID, the collectionID
-     * @param pillarID, the ID of the pillar in the collection 
-     * @param pageNumber, the page number for calculating offsets (@see pageSize)
-     * @param pageSize, the maximum number of results per page. 
+     * @param pillarID,     the ID of the pillar in the collection
+     * @param pageNumber,   the page number for calculating offsets (@see pageSize)
+     * @param pageSize,     the maximum number of results per page.
      */
     @GET
     @Path("/getMissingChecksumsFileIDs/")
     @Produces(MediaType.APPLICATION_JSON)
     public StreamingOutput getMissingChecksums(
-            @QueryParam("collectionID") String collectionID,
-            @QueryParam("pillarID") String pillarID,
-            @QueryParam("pageNumber") int pageNumber,
-            @DefaultValue("100") @QueryParam("pageSize") int pageSize) {
-        
+            @QueryParam("collectionID")
+                    String collectionID,
+            @QueryParam("pillarID")
+                    String pillarID,
+            @QueryParam("pageNumber")
+                    int pageNumber,
+            @DefaultValue("100")
+            @QueryParam("pageSize")
+                    int pageSize) {
+
         int firstID = (pageNumber - 1) * pageSize;
-            
+
         return streamPartFromLatestReport(ReportPart.MISSING_CHECKSUM, collectionID, pillarID, firstID, pageSize);
     }
 
     /**
-     * Method to get the list of obsolete checksums per pillar in a given collection. 
-     * @param collectionID, the collectionID 
-     * @param pillarID, the ID of the pillar in the collection 
-     * @param pageNumber, the page number for calculating offsets (@see pageSize)
-     * @param pageSize, the maximum number of results per page. 
+     * Method to get the list of obsolete checksums per pillar in a given collection.
+     *
+     * @param collectionID, the collectionID
+     * @param pillarID,     the ID of the pillar in the collection
+     * @param pageNumber,   the page number for calculating offsets (@see pageSize)
+     * @param pageSize,     the maximum number of results per page.
      */
     @GET
     @Path("/getObsoleteChecksumsFileIDs/")
     @Produces(MediaType.APPLICATION_JSON)
     public StreamingOutput geObsoleteChecksums(
-            @QueryParam("collectionID") String collectionID,
-            @QueryParam("pillarID") String pillarID,
-            @QueryParam("pageNumber") int pageNumber,
-            @DefaultValue("100") @QueryParam("pageSize") int pageSize) {
-        
+            @QueryParam("collectionID")
+                    String collectionID,
+            @QueryParam("pillarID")
+                    String pillarID,
+            @QueryParam("pageNumber")
+                    int pageNumber,
+            @DefaultValue("100")
+            @QueryParam("pageSize")
+                    int pageSize) {
+
         int firstID = (pageNumber - 1) * pageSize;
-            
+
         return streamPartFromLatestReport(ReportPart.OBSOLETE_CHECKSUM, collectionID, pillarID, firstID, pageSize);
     }
-    
+
     /**
-     * Method to get the list of present files on a pillar in a given collection. 
+     * Method to get the list of present files on a pillar in a given collection.
+     *
      * @param collectionID, the collectionID from which to return present file list
-     * @param pillarID, the ID of the pillar in the collection from which to return present file list
-     * @param pageNumber, the page number for calculating offsets (@see pageSize)
-     * @param pageSize, the number of checksum errors per page. 
+     * @param pillarID,     the ID of the pillar in the collection from which to return present file list
+     * @param pageNumber,   the page number for calculating offsets (@see pageSize)
+     * @param pageSize,     the number of checksum errors per page.
      */
     @GET
     @Path("/getAllFileIDs/")
     @Produces(MediaType.APPLICATION_JSON)
     public StreamingOutput getAllFileIDs(
-            @QueryParam("collectionID") String collectionID,
-            @QueryParam("pillarID") String pillarID,
-            @QueryParam("pageNumber") int pageNumber,
-            @DefaultValue("100") @QueryParam("pageSize") int pageSize) {
-        
+            @QueryParam("collectionID")
+                    String collectionID,
+            @QueryParam("pillarID")
+                    String pillarID,
+            @QueryParam("pageNumber")
+                    int pageNumber,
+            @DefaultValue("100")
+            @QueryParam("pageSize")
+                    int pageSize) {
+
         int firstID = (pageNumber - 1) * pageSize;
-        
+
         IntegrityIssueIterator it = model.getFilesOnPillar(pillarID, firstID, pageSize, collectionID);
-        
-        if(it != null) {
+
+        if (it != null) {
             return JSONStreamingTools.StreamIntegrityIssues(it);
         } else {
-            throw new WebApplicationException(Response.status(Response.Status.NO_CONTENT)
-                    .entity("Failed to get missing files from database")
-                    .type(MediaType.TEXT_PLAIN)
-                    .build());
+            throw new WebApplicationException(
+                    Response.status(Response.Status.NO_CONTENT).entity("Failed to get missing files from database")
+                            .type(MediaType.TEXT_PLAIN).build());
         }
     }
 
     /**
      * Get the listing of integrity status as a JSON array
-     * @throws IOException 
-     * @throws JsonGenerationException 
      */
     @GET
     @Path("/getIntegrityStatus/")
     @Produces(MediaType.APPLICATION_JSON)
-    public String getIntegrityStatus(@QueryParam("collectionID") String collectionID) throws JsonGenerationException, IOException {
+    public String getIntegrityStatus(
+            @QueryParam("collectionID")
+                    String collectionID) throws IOException {
         StringWriter writer = new StringWriter();
         JsonFactory jf = new JsonFactory();
         JsonGenerator jg = jf.createGenerator(writer);
         List<String> pillars = SettingsUtils.getPillarIDsForCollection(collectionID);
         Map<String, PillarCollectionStat> stats = new HashMap<>();
-        for(PillarCollectionStat stat : model.getLatestPillarStats(collectionID)) {
-            if(pillars.contains(stat.getPillarID())) {
+        for (PillarCollectionStat stat : model.getLatestPillarStats(collectionID)) {
+            if (pillars.contains(stat.getPillarID())) {
                 stats.put(stat.getPillarID(), stat);
             }
         }
-        for(String pillar : pillars) {
-            if(!stats.containsKey(pillar)) {
-                PillarCollectionStat emptyStat = new PillarCollectionStat(pillar, collectionID, 0L, 0L, 0L, 0L, 
-                        0L, 0L, new Date(0), new Date(0));;
+        for (String pillar : pillars) {
+            if (!stats.containsKey(pillar)) {
+                PillarCollectionStat emptyStat = new PillarCollectionStat(pillar, collectionID, 0L, 0L, 0L, 0L, 0L, 0L, new Date(0),
+                        new Date(0));
+                ;
                 stats.put(pillar, emptyStat);
             }
         }
         jg.writeStartArray();
-        for(PillarCollectionStat stat : stats.values()) {
+        for (PillarCollectionStat stat : stats.values()) {
             writeIntegrityStatusObject(stat, jg);
         }
         jg.writeEndArray();
@@ -236,20 +261,21 @@ public String getIntegrityStatus(@QueryParam("collectionID") String collectionID
     }
 
     /***
-     * Get the current workflows setup as a JSON array 
-     * @throws IOException 
+     * Get the current workflows setup as a JSON array
      */
     @GET
     @Path("/getWorkflowSetup/")
     @Produces(MediaType.APPLICATION_JSON)
-    public String getWorkflowSetup(@QueryParam("collectionID") String collectionID) throws IOException {
+    public String getWorkflowSetup(
+            @QueryParam("collectionID")
+                    String collectionID) throws IOException {
         try {
             StringWriter writer = new StringWriter();
             JsonFactory jf = new JsonFactory();
             JsonGenerator jg = jf.createGenerator(writer);
             jg.writeStartArray();
-            for(JobID workflowID : workflowManager.getWorkflows(collectionID)) {
-                writeWorflowSetupObject(workflowID, jg);
+            for (JobID workflowID : workflowManager.getWorkflows(collectionID)) {
+                writeWorkflowSetupObject(workflowID, jg);
             }
             jg.writeEndArray();
             jg.flush();
@@ -262,73 +288,78 @@ public String getWorkflowSetup(@QueryParam("collectionID") String collectionID)
     }
 
     /**
-     * Get the list of possible workflows as a JSON array 
+     * Get the list of possible workflows as a JSON array
      */
     @GET
     @Path("/getWorkflowList/")
     @Produces(MediaType.APPLICATION_JSON)
-    public List<String> getWorkflowList(@QueryParam("collectionID") String collectionID) {
+    public List<String> getWorkflowList(
+            @QueryParam("collectionID")
+                    String collectionID) {
         List<String> workflowIDs = new ArrayList<>();
-        for(JobID workflowID : workflowManager.getWorkflows(collectionID)) {
+        for (JobID workflowID : workflowManager.getWorkflows(collectionID)) {
             workflowIDs.add(workflowID.getWorkflowName());
         }
         return workflowIDs;
     }
-    
+
     /**
-     * Get the latest integrity report, or an error message telling no such report found.  
+     * Get the latest integrity report, or an error message telling no such report found.
      */
     @GET
     @Path("/getLatestIntegrityReport/")
     @Produces(MediaType.TEXT_PLAIN)
-    public StreamingOutput getLatestIntegrityReport(@QueryParam("collectionID") String collectionID) {
+    public StreamingOutput getLatestIntegrityReport(
+            @QueryParam("collectionID")
+                    String collectionID) {
         final File fullReport;
         try {
             fullReport = integrityReportProvider.getLatestIntegrityReportReader(collectionID).getFullReport();
         } catch (FileNotFoundException e) {
-            throw new WebApplicationException(Response.status(Response.Status.NOT_FOUND)
-                    .entity("No integrity report for collection: " + collectionID + " found!")
-                    .type(MediaType.TEXT_PLAIN)
-                    .build());
+            throw new WebApplicationException(
+                    Response.status(Response.Status.NOT_FOUND).entity("No integrity report for collection: " + collectionID + " found!")
+                            .type(MediaType.TEXT_PLAIN).build());
         }
-        return new StreamingOutput() {
-            public void write(OutputStream output) throws IOException, WebApplicationException {
-                try {
-                    int i;
-                    byte[] data = new byte[4096];
-                    FileInputStream is = new FileInputStream(fullReport);
-                    while((i = is.read(data)) >= 0) {
-                        output.write(data, 0, i);
-                    }
-                    is.close();
-                } catch (Exception e) {
-                    throw new WebApplicationException(e);
+        return output -> {
+            try {
+                int i;
+                byte[] data = new byte[4096];
+                FileInputStream is = new FileInputStream(fullReport);
+                while ((i = is.read(data)) >= 0) {
+                    output.write(data, 0, i);
                 }
+                is.close();
+            } catch (Exception e) {
+                throw new WebApplicationException(e);
             }
         };
     }
 
     /**
-     * Start a named workflow.  
+     * Start a named workflow.
      */
     @POST
     @Path("/startWorkflow/")
     @Consumes("application/x-www-form-urlencoded")
     @Produces("text/html")
-    public String startWorkflow(@FormParam("workflowID") String workflowID,
-                                @FormParam("collectionID") String collectionID) {
+    public String startWorkflow(
+            @FormParam("workflowID")
+                    String workflowID,
+            @FormParam("collectionID")
+                    String collectionID) {
         log.debug("Starting workflow '" + workflowID + "' on collection '" + collectionID + "'.");
         return workflowManager.startWorkflow(new JobID(workflowID, collectionID));
     }
 
     /**
-     * Start a named workflow.  
-     * @throws IOException 
+     * Start a named workflow.
      */
     @GET
     @Path("/getCollectionInformation/")
     @Produces(MediaType.APPLICATION_JSON)
-    public String getCollectionInformation(@QueryParam("collectionID") String collectionID) throws IOException {
+    public String getCollectionInformation(
+            @QueryParam("collectionID")
+                    String collectionID) throws IOException {
         StringWriter writer = new StringWriter();
         JsonFactory jf = new JsonFactory();
         JsonGenerator jg = jf.createGenerator(writer);
@@ -337,7 +368,7 @@ public String getCollectionInformation(@QueryParam("collectionID") String collec
         String lastIngestStr = lastIngest == null ? "No files ingested yet" : TimeUtils.shortDate(lastIngest);
         Long collectionSize;
         Long numberOfFiles;
-        if(stats == null || stats.isEmpty()) {
+        if (stats == null || stats.isEmpty()) {
             collectionSize = 0L;
             numberOfFiles = 0L;
         } else {
@@ -354,31 +385,29 @@ public String getCollectionInformation(@QueryParam("collectionID") String collec
         writer.flush();
         return writer.toString();
     }
-    
+
     /**
-     * Private method to help stream parts from a given ReportPart, collection and pillar. 
-     * @param part The part to stream issues from
+     * Private method to help stream parts from a given ReportPart, collection and pillar.
+     *
+     * @param part         The part to stream issues from
      * @param collectionID The ID of the collection
-     * @param pillarID The ID of the pillar 
-     * @param firstID Index of the first result
-     * @param maxLines The maximum number of lines to stream
+     * @param pillarID     The ID of the pillar
+     * @param firstID      Index of the first result
+     * @param maxLines     The maximum number of lines to stream
      */
-    private StreamingOutput streamPartFromLatestReport(ReportPart part, String collectionID, String pillarID, 
-            int firstID, int maxLines) {
+    private StreamingOutput streamPartFromLatestReport(ReportPart part, String collectionID, String pillarID, int firstID, int maxLines) {
         try {
             IntegrityReportReader reader = integrityReportProvider.getLatestIntegrityReportReader(collectionID);
-            File reportPart = reader.getReportPart(part.getPartname(), pillarID);
+            File reportPart = reader.getReportPart(part.getPartName(), pillarID);
             return JSONStreamingTools.StreamFileParts(reportPart, firstID, maxLines);
         } catch (FileNotFoundException e) {
             throw new WebApplicationException(Response.status(Response.Status.NOT_FOUND)
-                    .entity("No integrity '" + part.getHumanString() + "' report part for collection: " + collectionID 
-                            + " and pillar: " + pillarID + " found!")
-                    .type(MediaType.TEXT_PLAIN)
-                    .build());
+                    .entity("No integrity '" + part.getHumanString() + "' report part for collection: " + collectionID + " and pillar: " +
+                            pillarID + " found!").type(MediaType.TEXT_PLAIN).build());
         }
     }
-    
-    private void writeIntegrityStatusObject(PillarCollectionStat stat, JsonGenerator jg) throws JsonProcessingException, IOException {
+
+    private void writeIntegrityStatusObject(PillarCollectionStat stat, JsonGenerator jg) throws IOException {
         jg.writeStartObject();
         jg.writeObjectField("pillarID", stat.getPillarID());
         jg.writeObjectField("totalFileCount", stat.getFileCount());
@@ -389,14 +418,14 @@ private void writeIntegrityStatusObject(PillarCollectionStat stat, JsonGenerator
         jg.writeEndObject();
     }
 
-    private void writeWorflowSetupObject(JobID workflowID, JsonGenerator jg) throws JsonProcessingException, IOException {
+    private void writeWorkflowSetupObject(JobID workflowID, JsonGenerator jg) throws IOException {
         Workflow workflow = workflowManager.getWorkflow(workflowID);
         WorkflowStatistic lastRunStatistic = workflowManager.getLastCompleteStatistics(workflowID);
         jg.writeStartObject();
         jg.writeObjectField("workflowID", workflowID.getWorkflowName());
         jg.writeObjectField("workflowDescription", workflow.getDescription());
         Date nextScheduledRun = workflowManager.getNextScheduledRun(workflowID);
-        if(nextScheduledRun == null) {
+        if (nextScheduledRun == null) {
             jg.writeObjectField("nextRun", "Must be run manually");
         } else {
             jg.writeObjectField("nextRun", TimeUtils.shortDate(nextScheduledRun));
@@ -412,13 +441,13 @@ private void writeWorflowSetupObject(JobID workflowID, JsonGenerator jg) throws
         }
         long runInterval = workflowManager.getRunInterval(workflowID);
         String intervalString;
-        if (runInterval == -1 ) {
+        if (runInterval == -1) {
             intervalString = "Never";
-        }  else {
+        } else {
             intervalString = TimeUtils.millisecondsToHuman(runInterval);
         }
         jg.writeObjectField("executionInterval", intervalString);
         jg.writeObjectField("currentState", workflowManager.getCurrentStatistics(workflowID).getPartStatistics());
-        jg.writeEndObject();        
+        jg.writeEndObject();
     }
 }
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/web/RestStatisticsService.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/web/RestStatisticsService.java
index 4963aa3bc..7ca63d128 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/web/RestStatisticsService.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/web/RestStatisticsService.java
@@ -5,35 +5,22 @@
  * Copyright (C) 2010 - 2013 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.integrityservice.web;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-
 import org.bitrepository.common.utils.FileSizeUtils;
 import org.bitrepository.common.utils.SettingsUtils;
 import org.bitrepository.common.utils.TimeUtils;
@@ -45,22 +32,38 @@
 import org.bitrepository.integrityservice.cache.IntegrityModel;
 import org.bitrepository.integrityservice.cache.PillarCollectionStat;
 
+import javax.ws.rs.DefaultValue;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.MediaType;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 @Path("/Statistics")
 public class RestStatisticsService {
-    private IntegrityModel model;
+    private final IntegrityModel model;
 
     public RestStatisticsService() {
         this.model = IntegrityServiceManager.getIntegrityModel();
     }
-     
+
     @GET
     @Path("/getDataSizeHistory/")
     @Produces(MediaType.APPLICATION_JSON)
-    public List<StatisticsDataSize> getDataSizeHistory(@QueryParam("collectionID") String collectionID, 
-            @QueryParam("maxEntries") @DefaultValue("1000") int maxEntries) {
+    public List<StatisticsDataSize> getDataSizeHistory(
+            @QueryParam("collectionID")
+                    String collectionID,
+            @QueryParam("maxEntries")
+            @DefaultValue("1000")
+                    int maxEntries) {
         List<CollectionStat> stats = model.getLatestCollectionStat(collectionID, maxEntries);
         List<StatisticsDataSize> data = new ArrayList<>();
-        for(CollectionStat stat : stats) {
+        for (CollectionStat stat : stats) {
             StatisticsDataSize obj = new StatisticsDataSize();
             Date statTime = stat.getStatsTime();
             obj.setDateMillis(statTime.getTime());
@@ -69,24 +72,24 @@ public List<StatisticsDataSize> getDataSizeHistory(@QueryParam("collectionID") S
             obj.setFileCount(stat.getFileCount());
             data.add(obj);
         }
-        
+
         return data;
     }
-    
+
     @GET
     @Path("/getLatestPillarDataSize/")
     @Produces(MediaType.APPLICATION_JSON)
     public List<StatisticsPillarSize> getLatestPillarDataSize() {
         return getCurrentPillarsDataSize();
     }
-    
+
     @GET
     @Path("/getLatestcollectionDataSize/")
     @Produces(MediaType.APPLICATION_JSON)
     public List<StatisticsCollectionSize> getLatestCollectionDataSize() {
         List<StatisticsCollectionSize> data = new ArrayList<>();
         List<CollectionStat> stats = getLatestCollectionStatistics();
-        for(CollectionStat stat : stats) {
+        for (CollectionStat stat : stats) {
             StatisticsCollectionSize obj = new StatisticsCollectionSize();
             obj.setCollectionID(stat.getCollectionID());
             obj.setCollectionName(SettingsUtils.getCollectionName(stat.getCollectionID()));
@@ -94,14 +97,14 @@ public List<StatisticsCollectionSize> getLatestCollectionDataSize() {
             obj.setHumanSize(FileSizeUtils.toHumanShortDecimal(stat.getDataSize()));
             data.add(obj);
         }
-        return data;    
+        return data;
     }
 
     public List<CollectionStat> getLatestCollectionStatistics() {
         List<CollectionStat> res = new ArrayList<>();
-        for(String collection : SettingsUtils.getAllCollectionsIDs()) {
+        for (String collection : SettingsUtils.getAllCollectionsIDs()) {
             List<CollectionStat> stats = model.getLatestCollectionStat(collection, 1);
-            if(!stats.isEmpty()) {
+            if (!stats.isEmpty()) {
                 res.add(stats.get(0));
             }
         }
@@ -110,15 +113,15 @@ public List<CollectionStat> getLatestCollectionStatistics() {
 
     public List<StatisticsPillarSize> getCurrentPillarsDataSize() {
         Map<String, StatisticsPillarSize> stats = new HashMap<>();
-        for(String pillar: SettingsUtils.getAllPillarIDs()) {
+        for (String pillar : SettingsUtils.getAllPillarIDs()) {
             StatisticsPillarSize stat = new StatisticsPillarSize();
             stat.setPillarID(pillar);
             stat.setDataSize(0L);
             stat.setHumanSize("0 B");
             stats.put(pillar, stat);
         }
-        for(String collection : SettingsUtils.getAllCollectionsIDs()) {
-            for(PillarCollectionStat pillarStat : model.getLatestPillarStats(collection)) {
+        for (String collection : SettingsUtils.getAllCollectionsIDs()) {
+            for (PillarCollectionStat pillarStat : model.getLatestPillarStats(collection)) {
                 StatisticsPillarSize stat = stats.get(pillarStat.getPillarID());
                 stat.setDataSize(stat.getDataSize() + pillarStat.getDataSize());
                 stat.setHumanSize(FileSizeUtils.toHumanShortDecimal(stat.getDataSize()));
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/CompleteIntegrityCheck.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/CompleteIntegrityCheck.java
index 8773e0d8e..3f8175280 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/CompleteIntegrityCheck.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/CompleteIntegrityCheck.java
@@ -5,60 +5,55 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.integrityservice.workflow;
 
-import java.util.Date;
-
 import org.bitrepository.common.utils.ChecksumUtils;
 import org.bitrepository.integrityservice.workflow.step.FullUpdateChecksumsStep;
 import org.bitrepository.integrityservice.workflow.step.FullUpdateFileIDsStep;
 import org.bitrepository.integrityservice.workflow.step.UpdateChecksumsStep;
 import org.bitrepository.integrityservice.workflow.step.UpdateFileIDsStep;
 
+import java.util.Date;
+
 /**
- * Simple workflow for performing integrity checks of the system. 
+ * Simple workflow for performing integrity checks of the system.
  * Starts by updating the file ids in the integrity model, followed by updating the checksums in the integrity model.
  * Then the data is validated for integrity issues.
  * And finally it is verified whether any missing or obsolete checksums can be found.
  */
 public class CompleteIntegrityCheck extends IntegrityCheckWorkflow {
-    /**
-     * Remember to call the initialise method needs to be called before the start method.
-     */
     public CompleteIntegrityCheck() {}
 
 
     @Override
     public String getDescription() {
-        return "Retrieves all fileIDs and checksums from all pillars and checks for all potential integrity " +
-                "problems.";
+        return "Retrieves all fileIDs and checksums from all pillars and checks for all potential integrity " + "problems.";
     }
 
     @Override
     protected UpdateFileIDsStep getUpdateFileIDsStep() {
-        return new FullUpdateFileIDsStep(context.getCollector(), context.getStore(),
-                context.getAlerter(), context.getSettings(), collectionID, integrityContributors);
+        return new FullUpdateFileIDsStep(context.getCollector(), context.getStore(), context.getAlerter(), context.getSettings(),
+                collectionID, integrityContributors);
     }
 
 
     @Override
     protected UpdateChecksumsStep getUpdateChecksumsStep() {
-        return new FullUpdateChecksumsStep(
-                context.getCollector(), context.getStore(), context.getAlerter(),
+        return new FullUpdateChecksumsStep(context.getCollector(), context.getStore(), context.getAlerter(),
                 ChecksumUtils.getDefault(context.getSettings()), context.getSettings(), collectionID, integrityContributors);
     }
 
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/IncrementalIntegrityCheck.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/IncrementalIntegrityCheck.java
index d1e9e7c13..27a12f89b 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/IncrementalIntegrityCheck.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/IncrementalIntegrityCheck.java
@@ -5,59 +5,54 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.integrityservice.workflow;
 
-import java.util.Date;
-
 import org.bitrepository.common.utils.ChecksumUtils;
 import org.bitrepository.integrityservice.workflow.step.IncrementalUpdateChecksumsStep;
 import org.bitrepository.integrityservice.workflow.step.IncrementalUpdateFileIDsStep;
 import org.bitrepository.integrityservice.workflow.step.UpdateChecksumsStep;
 import org.bitrepository.integrityservice.workflow.step.UpdateFileIDsStep;
 
+import java.util.Date;
+
 /**
- * Simple workflow for performing integrity checks of the system. 
+ * Simple workflow for performing integrity checks of the system.
  * Starts by updating the file ids in the integrity model, followed by updating the checksums in the integrity model.
  * Then the data is validated for integrity issues.
  * And finally it is verified whether any missing or obsolete checksums can be found.
  */
 public class IncrementalIntegrityCheck extends IntegrityCheckWorkflow {
-    /**
-     * Remember to call the initialise method needs to be called before the start method.
-     */
     public IncrementalIntegrityCheck() {}
 
     @Override
     public String getDescription() {
-        return "Retrieves new fileIDs and checksums from all pillars and checks for all potential integrity " +
-                "problems.";
+        return "Retrieves new fileIDs and checksums from all pillars and checks for all potential integrity " + "problems.";
     }
 
     @Override
     protected UpdateFileIDsStep getUpdateFileIDsStep() {
-        return new IncrementalUpdateFileIDsStep(context.getCollector(), context.getStore(),
-                context.getAlerter(), context.getSettings(), collectionID, integrityContributors);
+        return new IncrementalUpdateFileIDsStep(context.getCollector(), context.getStore(), context.getAlerter(), context.getSettings(),
+                collectionID, integrityContributors);
     }
 
     @Override
     protected UpdateChecksumsStep getUpdateChecksumsStep() {
         return new IncrementalUpdateChecksumsStep(context.getCollector(), context.getStore(), context.getAlerter(),
-                ChecksumUtils.getDefault(context.getSettings()), context.getSettings(), collectionID, 
-                integrityContributors);
+                ChecksumUtils.getDefault(context.getSettings()), context.getSettings(), collectionID, integrityContributors);
     }
 
     @Override
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/IntegrityCheckWorkflow.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/IntegrityCheckWorkflow.java
index 772fc6791..a91fb7e6c 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/IntegrityCheckWorkflow.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/IntegrityCheckWorkflow.java
@@ -5,25 +5,22 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.integrityservice.workflow;
 
-import java.io.IOException;
-import java.util.Date;
-
 import org.bitrepository.common.utils.SettingsUtils;
 import org.bitrepository.integrityservice.IntegrityServiceManager;
 import org.bitrepository.integrityservice.reports.BasicIntegrityReporter;
@@ -44,21 +41,26 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.util.Date;
+
 /**
- * Simple workflow for performing integrity checks of the system. 
+ * Simple workflow for performing integrity checks of the system.
  * Starts by updating the file ids in the integrity model, followed by updating the checksums in the integrity model.
  * Then the data is validated for integrity issues.
  * And finally it is verified whether any missing or obsolete checksums can be found.
  */
 public abstract class IntegrityCheckWorkflow extends Workflow {
     private final Logger log = LoggerFactory.getLogger(getClass());
-    /** The context for the workflow.*/
     protected IntegrityWorkflowContext context;
     protected String collectionID;
     protected IntegrityContributors integrityContributors;
     protected Date workflowStart;
-    /** The default number of retries if none is set in ReferenceSettings */
+    /**
+     * The default number of retries if none is set in ReferenceSettings
+     */
     private static final int DEFAULT_MAX_RETRIES = 3;
+
     /**
      * Remember to call the initialise method needs to be called before the start method.
      */
@@ -66,80 +68,80 @@ public IntegrityCheckWorkflow() {}
 
     @Override
     public void initialise(WorkflowContext context, String collectionID) {
-        this.context = (IntegrityWorkflowContext)context;
+        this.context = (IntegrityWorkflowContext) context;
         this.collectionID = collectionID;
         jobID = new JobID(getClass().getSimpleName(), collectionID);
     }
-    
+
     protected abstract UpdateFileIDsStep getUpdateFileIDsStep();
-    
+
     protected abstract UpdateChecksumsStep getUpdateChecksumsStep();
-    
+
     protected abstract boolean cleanDeletedFiles();
-    
+
     protected abstract Date getChecksumUpdateCutoffDate();
-    
+
     @Override
     public void start() {
-        
+
         workflowStart = new Date();
-        
+
         if (context == null) {
             throw new IllegalStateException("The workflow can not be started before the initialise method has been " +
                     "called.");
         }
         IntegrityReporter reporter = new BasicIntegrityReporter(jobID.getCollectionID(), jobID.getWorkflowName(),
                 IntegrityServiceManager.getIntegrityReportStorageDir());
-        
+
         super.start();
         try {
             StatisticsCollector statisticsCollector = new StatisticsCollector(collectionID);
-            Integer maxRetries 
-                = context.getSettings().getReferenceSettings().getIntegrityServiceSettings().getComponentRetries();
-            integrityContributors = new IntegrityContributors(SettingsUtils.getPillarIDsForCollection(collectionID), 
+            Integer maxRetries
+                    = context.getSettings().getReferenceSettings().getIntegrityServiceSettings().getComponentRetries();
+            integrityContributors = new IntegrityContributors(SettingsUtils.getPillarIDsForCollection(collectionID),
                     maxRetries == null ? DEFAULT_MAX_RETRIES : maxRetries);
-            
+
             UpdateFileIDsStep updateFileIDsStep = getUpdateFileIDsStep();
             performStep(updateFileIDsStep);
-            
+
             integrityContributors.reloadActiveContributors();
-            
+
             UpdateChecksumsStep updateChecksumStep = getUpdateChecksumsStep();
             performStep(updateChecksumStep);
 
-            if(cleanDeletedFiles()) {
-                HandleDeletedFilesStep handleDeletedFilesStep = new HandleDeletedFilesStep(context.getStore(), 
+            if (cleanDeletedFiles()) {
+                HandleDeletedFilesStep handleDeletedFilesStep = new HandleDeletedFilesStep(context.getStore(),
                         reporter, workflowStart, integrityContributors.getFinishedContributors());
                 performStep(handleDeletedFilesStep);
             }
-            
+
             statisticsCollector.getCollectionStat().setStatsTime(new Date());
-            Long missingFileGracePeriod 
-                = context.getSettings().getReferenceSettings().getIntegrityServiceSettings().getTimeBeforeMissingFileCheck();
+            Long missingFileGracePeriod
+                    = context.getSettings().getReferenceSettings().getIntegrityServiceSettings().getTimeBeforeMissingFileCheck();
             HandleMissingFilesStep handleMissingFilesStep = new HandleMissingFilesStep(context.getStore(), reporter,
                     statisticsCollector, missingFileGracePeriod);
             performStep(handleMissingFilesStep);
-            
-            HandleChecksumValidationStep handleChecksumValidationStep 
-                    = new HandleChecksumValidationStep(context.getStore(), context.getAuditManager(), reporter, 
-                            statisticsCollector);
+
+            HandleChecksumValidationStep handleChecksumValidationStep
+                    = new HandleChecksumValidationStep(context.getStore(), context.getAuditManager(), reporter,
+                    statisticsCollector);
             performStep(handleChecksumValidationStep);
-            
-            HandleMissingChecksumsStep handleMissingChecksumsStep = new HandleMissingChecksumsStep(context.getStore(), 
+
+            HandleMissingChecksumsStep handleMissingChecksumsStep = new HandleMissingChecksumsStep(context.getStore(),
                     reporter, statisticsCollector, getChecksumUpdateCutoffDate());
             performStep(handleMissingChecksumsStep);
-            
-            HandleObsoleteChecksumsStep handleObsoleteChecksumsStep 
-                    = new HandleObsoleteChecksumsStep(context.getSettings(), context.getStore(), reporter, 
-                            statisticsCollector);
+
+            HandleObsoleteChecksumsStep handleObsoleteChecksumsStep
+                    = new HandleObsoleteChecksumsStep(context.getSettings(), context.getStore(), reporter,
+                    statisticsCollector);
             performStep(handleObsoleteChecksumsStep);
-            
+
             CreateStatisticsEntryStep createStatistics = new CreateStatisticsEntryStep(
                     context.getStore(), collectionID, statisticsCollector);
             performStep(createStatistics);
 
-            if(currentState() != WorkflowState.ABORTED) {
-                if(reporter.hasIntegrityIssues()) {
+            if (currentState() != WorkflowState.ABORTED) {
+                if (reporter.hasIntegrityIssues()) {
                     context.getAlerter().integrityFailed(reporter.generateSummaryOfReport(), collectionID);
                 }
                 try {
@@ -148,7 +150,7 @@ public void start() {
                 } catch (IOException e) {
                     log.error("Failed to generate integrity report", e);
                     context.getAlerter().integrityComponentFailure("Failed to generate integrity report", collectionID);
-                }   
+                }
             }
         } finally {
             finish();
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/IntegrityContributors.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/IntegrityContributors.java
index 3b8f03162..037193bee 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/IntegrityContributors.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/IntegrityContributors.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -31,100 +31,104 @@
 /**
  * Class to carry and store active, failed and finished contributors for keeping track of who to collect from.
  * The class also handles retries, i.e. contributors are not failed unless they fail a number of times in a row.
- * 
+ * <p>
  * The class handles the state of contributors:
- *  - Active, a contributor that have not had all its information collected. 
- *  - Failed, a contributor that have failed delivering information
- *  - Finished, a contributor that have delivered all information  
+ * - Active, a contributor that have not had all its information collected.
+ * - Failed, a contributor that have failed delivering information
+ * - Finished, a contributor that have delivered all information
  */
 public class IntegrityContributors {
-
     Set<String> finishedContributors = Collections.synchronizedSet(new HashSet<>());
     Set<String> failedContributors = Collections.synchronizedSet(new HashSet<>());
-    /** Mapping between active contributors and how many times they each have failed in a row */
-    Map<String, Integer> activeContributors = Collections.synchronizedMap(new HashMap<>()); 
-    private int maxContributorFailures;
-    
     /**
-     * Constructor, initializes the set of active contributors 
-     * @param contributors The full set of contributors, all are set as active initially
+     * Mapping between active contributors and how many times they each have failed in a row
+     */
+    Map<String, Integer> activeContributors = Collections.synchronizedMap(new HashMap<>());
+    private final int maxContributorFailures;
+
+    /**
+     * Constructor, initializes the set of active contributors
+     *
+     * @param contributors           The full set of contributors, all are set as active initially
      * @param maxContributorFailures The number of times in a row a contributor must have failed to be marked as failed
      */
     public IntegrityContributors(Collection<String> contributors, int maxContributorFailures) {
-        for(String contributor : contributors) {
+        for (String contributor : contributors) {
             activeContributors.put(contributor, 0);
         }
         this.maxContributorFailures = maxContributorFailures;
     }
-    
+
     /**
-     * Move all finished contributors to active contributors 
+     * Move all finished contributors to active contributors
      */
     public synchronized void reloadActiveContributors() {
-        for(String contributor : finishedContributors) {
+        for (String contributor : finishedContributors) {
             activeContributors.put(contributor, 0);
         }
         finishedContributors.clear();
     }
-    
+
     /**
      * @return the set of finished contributors
      */
     public Set<String> getFinishedContributors() {
         return new HashSet<>(finishedContributors);
     }
-    
+
     /**
-     *  @return the set of failed contributors
+     * @return the set of failed contributors
      */
     public Set<String> getFailedContributors() {
         return new HashSet<>(failedContributors);
     }
-    
+
     /**
      * @return the set of active contributors
      */
     public Set<String> getActiveContributors() {
         return new HashSet<>(activeContributors.keySet());
     }
-    
+
     /**
-     * Mark an contributor as having failed an attempt 
+     * Mark an contributor as having failed an attempt
+     *
      * @param contributor The contributor which have failed
      */
     public synchronized void failContributor(String contributor) {
         Integer failures = activeContributors.get(contributor);
-        if(failures != null) {
+        if (failures != null) {
             failures++;
-            if(failures >= maxContributorFailures) {
+            if (failures >= maxContributorFailures) {
                 failedContributors.add(contributor);
                 activeContributors.remove(contributor);
             } else {
                 activeContributors.put(contributor, failures);
             }
-            
         }
     }
-    
+
     /**
-     * Mark a contributor as having succeeded the last request. 
+     * Mark a contributor as having succeeded the last request.
+     *
      * @param contributor The contributor which have succeeded
      */
     public synchronized void succeedContributor(String contributor) {
-        if(activeContributors.containsKey(contributor)) {
+        if (activeContributors.containsKey(contributor)) {
             activeContributors.put(contributor, 0);
         }
     }
-    
+
     /**
      * Mark an contributor as finished
+     *
      * @param contributor The contributor which have finished
      */
     public synchronized void finishContributor(String contributor) {
-        if(activeContributors.containsKey(contributor)) {
+        if (activeContributors.containsKey(contributor)) {
             finishedContributors.add(contributor);
             activeContributors.remove(contributor);
         }
     }
-    
+
 }
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/IntegrityWorkflowContext.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/IntegrityWorkflowContext.java
index 1d3b0f3e0..424055aa4 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/IntegrityWorkflowContext.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/IntegrityWorkflowContext.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -41,17 +41,17 @@ public class IntegrityWorkflowContext implements WorkflowContext {
     private final AuditTrailManager auditManager;
 
     /**
-     * @param settings The <code>Settings</code> to use in the workflow.
-     * @param collector The <code>IntegrityInformationCollector</code> to use in the workflow.
-     * @param store The <code>IntegrityModel</code> to use in the workflow.
-     * @param alerter The <code>IntegrityAlerter</code> to use in the workflow.
+     * @param settings     The <code>Settings</code> to use in the workflow.
+     * @param collector    The <code>IntegrityInformationCollector</code> to use in the workflow.
+     * @param store        The <code>IntegrityModel</code> to use in the workflow.
+     * @param alerter      The <code>IntegrityAlerter</code> to use in the workflow.
      * @param auditManager The <code>AuditTrailManager</code> to use in the workflow.
      */
     public IntegrityWorkflowContext(Settings settings,
-            IntegrityInformationCollector collector,
-            IntegrityModel store,
-            IntegrityAlerter alerter,
-            AuditTrailManager auditManager) {
+                                    IntegrityInformationCollector collector,
+                                    IntegrityModel store,
+                                    IntegrityAlerter alerter,
+                                    AuditTrailManager auditManager) {
         this.settings = settings;
         this.collector = collector;
         this.store = store;
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/IntegrityWorkflowManager.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/IntegrityWorkflowManager.java
index 15c7ea4db..a1c24cd48 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/IntegrityWorkflowManager.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/IntegrityWorkflowManager.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -39,9 +39,7 @@ public class IntegrityWorkflowManager extends WorkflowManager {
     public static final long HOURLY = 360000;
 
     public IntegrityWorkflowManager(IntegrityWorkflowContext context, JobScheduler scheduler) {
-        super(context,
-              getWorkflowSettings(context.getSettings()),
-              scheduler);
+        super(context, getWorkflowSettings(context.getSettings()), scheduler);
     }
 
     private static WorkflowSettings getWorkflowSettings(Settings settings) {
@@ -55,8 +53,9 @@ private static WorkflowSettings getWorkflowSettings(Settings settings) {
     }
 
     /**
-     * Will create a default set of workflows. This is currently just the <code>CompleteIntegrityCheck</code>
+     * Will create a default set of workflows. This is currently just the {@link CompleteIntegrityCheck}
      * workflow running once a day on all collections.
+     *
      * @return a default set of workflows
      */
     protected static WorkflowSettings createDefaultWorkflowSettings() {
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/RepairMissingFilesWorkflow.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/RepairMissingFilesWorkflow.java
index c9407b441..fef080c9b 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/RepairMissingFilesWorkflow.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/RepairMissingFilesWorkflow.java
@@ -5,30 +5,22 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.integrityservice.workflow;
 
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
 import org.bitrepository.common.utils.SettingsUtils;
 import org.bitrepository.integrityservice.cache.FileInfo;
 import org.bitrepository.integrityservice.cache.database.IntegrityIssueIterator;
@@ -43,43 +35,49 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Simple workflow for repairing missing files.
- * Repairs 100 files per pillars. 
+ * Repairs 100 files per pillars.
  */
 public class RepairMissingFilesWorkflow extends Workflow {
     private final Logger log = LoggerFactory.getLogger(getClass());
-    /** The context for the workflow.*/
     protected IntegrityWorkflowContext context;
     protected String collectionID;
     protected IntegrityContributors integrityContributors;
-    protected Date workflowStart;
     protected WorkflowStep step = null;
-    
+
     private static final long MAX_RESULTS = 100L;
-    /** List to keep track over the files, which have been */
+    /**
+     * List to keep track over the files, which have been
+     */
     protected List<String> repairedFiles;
-    
+
     /**
      * Remember to call the initialize method needs to be called before the start method.
      */
-    public RepairMissingFilesWorkflow() { }
+    public RepairMissingFilesWorkflow() {}
 
     @Override
     public void initialise(WorkflowContext context, String collectionID) {
-        this.context = (IntegrityWorkflowContext)context;
+        this.context = (IntegrityWorkflowContext) context;
         this.collectionID = collectionID;
         jobID = new JobID(getClass().getSimpleName(), collectionID);
     }
-    
+
     @Override
     public void start() {
         if (context == null) {
-            throw new IllegalStateException("The workflow can not be started before the initialise method has been " +
-                    "called.");
+            throw new IllegalStateException("The workflow can not be started before the initialise method has been " + "called.");
         }
         super.start();
-        
+
         List<String> pillars = SettingsUtils.getPillarIDsForCollection(collectionID);
 
         repairedFiles = new ArrayList<>();
@@ -90,24 +88,25 @@ public void start() {
             finish();
         }
     }
-    
+
     /**
      * Repairs the missing files.
+     *
      * @param pillarIDs The set of pillars to repair files on.
      */
     private void repairMissingFiles(List<String> pillarIDs) {
         List<String> filesNotRepaired = new ArrayList<>();
-        try(IntegrityIssueIterator iterator = context.getStore().findFilesWithMissingCopies(collectionID, 
-                pillarIDs.size(), 0L, MAX_RESULTS)) {
-    
+        try (IntegrityIssueIterator iterator = context.getStore()
+                .findFilesWithMissingCopies(collectionID, pillarIDs.size(), 0L, MAX_RESULTS)) {
+
             String fileId;
-            while((fileId = iterator.getNextIntegrityIssue()) != null) {
+            while ((fileId = iterator.getNextIntegrityIssue()) != null) {
                 // Do not try to repair file, which has already been repaired.
-                if(repairedFiles.contains(fileId)) {
+                if (repairedFiles.contains(fileId)) {
                     continue;
                 }
                 repairedFiles.add(fileId);
-                        
+
                 try {
                     String checksum = getChecksumForFile(fileId);
                     URL url = createURL(fileId);
@@ -116,57 +115,59 @@ private void repairMissingFiles(List<String> pillarIDs) {
                     deleteUrl(url);
                 } catch (Exception e) {
                     // Fault barrier. Just try to continue
-                    log.warn("Error occured during repair of missing file, '" + fileId + "'. Tries to continue.", e);
+                    log.warn("Error occurred during repair of missing file, '" + fileId + "'. Tries to continue.", e);
                     filesNotRepaired.add(fileId);
                 }
             }
-        } 
-        if(!filesNotRepaired.isEmpty()) {
+        }
+        if (!filesNotRepaired.isEmpty()) {
             context.getAlerter().operationFailed("Failed to repair the files '" + filesNotRepaired + "'.", collectionID);
         }
     }
-    
+
     /**
      * Extracts the checksum for the file at the collection.
      * Will throw an exception, if no unanimous checksum is found - or no checksum at all.
+     *
      * @param fileId The id of the file, whose checksum should be extracted.
      * @return The checksum for the file.
      */
     private String getChecksumForFile(String fileId) {
         String res = null;
-        for(FileInfo fi : context.getStore().getFileInfos(fileId, collectionID)) {
-            if(res == null) {
+        for (FileInfo fi : context.getStore().getFileInfos(fileId, collectionID)) {
+            if (res == null) {
                 res = fi.getChecksum();
             } else {
                 // validate, so we do not encounter an integrity issue.
-                if(fi.getChecksum() != null && !res.equals(fi.getChecksum())) {
-                    throw new IllegalStateException("Cannot extract an unanimous checksum for file '" + fileId 
-                            + "' at collection '" + collectionID + "'.");
+                if (fi.getChecksum() != null && !res.equals(fi.getChecksum())) {
+                    throw new IllegalStateException(
+                            "Cannot extract an unanimous checksum for file '" + fileId + "' at collection '" + collectionID + "'.");
                 }
             }
         }
-        if(res == null) {
-            throw new IllegalStateException("No checksum found for file '" + fileId + "' at collection '" 
-                    + collectionID + "'");
+        if (res == null) {
+            throw new IllegalStateException("No checksum found for file '" + fileId + "' at collection '" + collectionID + "'");
         }
         return res;
     }
-    
+
     /**
      * Creates a URL a given file id at our file-exchange.
+     *
      * @param fileId The id of the file to get the URL for.
      * @return The URL for the file.
-     * @throws MalformedURLException If a wellformed URL cannot be created.
+     * @throws MalformedURLException If a well-formed URL cannot be created.
      */
     private URL createURL(String fileId) throws MalformedURLException {
         FileExchange fe = ProtocolComponentFactory.getInstance().getFileExchange(context.getSettings());
         return fe.getURL(fileId);
     }
-    
+
     /**
      * Performs the GetFile operation for the fileId for having the file delivered at the given URL.
+     *
      * @param fileId The id of the file.
-     * @param url The URL 
+     * @param url    The URL
      */
     private void getFileStep(String fileId, URL url) {
         try {
@@ -176,11 +177,12 @@ private void getFileStep(String fileId, URL url) {
             step = null;
         }
     }
-    
+
     /**
      * Performs the put file step, where the file at the URL at put at all the pillars, who are missing it.
-     * @param fileId The id of the file.
-     * @param url The URL for the put file.
+     *
+     * @param fileId   The id of the file.
+     * @param url      The URL for the put file.
      * @param checksum The checksum of the file.
      */
     private void putFileStep(String fileId, URL url, String checksum) {
@@ -191,25 +193,25 @@ private void putFileStep(String fileId, URL url, String checksum) {
             step = null;
         }
     }
-    
+
     /**
      * Deletes the file at the file-exchange.
+     *
      * @param url The URL for the file to delete.
-     * @throws IOException If an issue occur while deleting the file.
      * @throws URISyntaxException If the URL is invalid.
      */
     private void deleteUrl(URL url) throws URISyntaxException {
         FileExchange fe = ProtocolComponentFactory.getInstance().getFileExchange(context.getSettings());
         try {
             fe.deleteFile(url);
-        } catch(IOException e) {
+        } catch (IOException e) {
             // Not critical, if we cannot remove the file.
             log.warn("Issue deleting file from FileExchange", e);
         }
     }
 
-	@Override
-	public String getDescription() {
-		return "Can repair " + MAX_RESULTS + " files per run.";
-	}
+    @Override
+    public String getDescription() {
+        return "Can repair " + MAX_RESULTS + " files per run.";
+    }
 }
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/SaltedChecksumWorkflow.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/SaltedChecksumWorkflow.java
index a319f011b..3a8b8fa12 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/SaltedChecksumWorkflow.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/SaltedChecksumWorkflow.java
@@ -5,29 +5,22 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.integrityservice.workflow;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-import java.util.UUID;
-
 import org.bitrepository.bitrepositoryelements.ChecksumSpecTYPE;
 import org.bitrepository.bitrepositoryelements.ChecksumType;
 import org.bitrepository.bitrepositoryelements.FileAction;
@@ -41,31 +34,44 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.UUID;
+
 /**
  * Simple workflow for validating files with random salted checksum.
- * Only chooses one single file for each run. 
- * 
- * The GetChecksumClient automatically ignores any checksum-pillars and other pillars, 
+ * Only chooses one single file for each run.
+ * <p>
+ * The GetChecksumClient automatically ignores any checksum-pillars and other pillars,
  * who are not able to handle salted checksums.
  */
 public class SaltedChecksumWorkflow extends Workflow {
     private final static Logger log = LoggerFactory.getLogger(SaltedChecksumWorkflow.class);
-    /** The context for the workflow.*/
+    /**
+     * The context for the workflow.
+     */
     protected IntegrityWorkflowContext context;
     protected String collectionID;
     protected IntegrityContributors integrityContributors;
     protected Date workflowStart;
     protected WorkflowStep step = null;
-    
-    /** The current FileID to validate. Set to null, when not checking any file.*/
+
+    /**
+     * The current FileID to validate. Set to null, when not checking any file.
+     */
     protected String currentFileID = null;
-    /** The current ChecksumSpec. Set to null, when not checking any file.*/
+    /**
+     * The current ChecksumSpec. Set to null, when not checking any file.
+     */
     protected ChecksumSpecTYPE currentChecksumSpec = null;
-        
+
     /**
      * Remember to call the initialize method needs to be called before the start method.
      */
-    public SaltedChecksumWorkflow() { }
+    public SaltedChecksumWorkflow() {}
 
     @Override
     public void initialise(WorkflowContext context, String collectionID) {
@@ -73,14 +79,13 @@ public void initialise(WorkflowContext context, String collectionID) {
         this.collectionID = collectionID;
         jobID = new JobID(getClass().getSimpleName(), collectionID);
         List<String> pillars = SettingsUtils.getPillarIDsForCollection(collectionID);
-        integrityContributors = new IntegrityContributors(pillars, 0); 
+        integrityContributors = new IntegrityContributors(pillars, 0);
     }
-    
+
     @Override
     public void start() {
         if (context == null) {
-            throw new IllegalStateException("The workflow can not be started before the initialise method has been " +
-                    "called.");
+            throw new IllegalStateException("The workflow can not be started before the initialise method has been " + "called.");
         }
         super.start();
 
@@ -95,118 +100,119 @@ public void start() {
             finish();
         }
     }
-    
+
     /**
      * Creates a random checksum spec.
      * Chooses the HMAC version of the default checksum algorithm.
      * Then generate a UUID and use it as the salt.
-     * @return The checksumspec.
+     *
+     * @return The actual {@link ChecksumSpecTYPE}.
      */
     private ChecksumSpecTYPE getChecksumSpecWithRandomSalt() {
-        ChecksumType defaultChecksum = ChecksumType.valueOf(context.getSettings().getRepositorySettings().getProtocolSettings().getDefaultChecksumType());
+        ChecksumType defaultChecksum = ChecksumType.valueOf(
+                context.getSettings().getRepositorySettings().getProtocolSettings().getDefaultChecksumType());
         ChecksumSpecTYPE res = new ChecksumSpecTYPE();
-        switch(defaultChecksum) {
-        case SHA1:
-            res.setChecksumType(ChecksumType.HMAC_SHA1);
-            break;
-        case SHA256:
-            res.setChecksumType(ChecksumType.HMAC_SHA256);
-            break;
-        case SHA384:
-            res.setChecksumType(ChecksumType.HMAC_SHA384);
-            break;
-        case SHA512:
-            res.setChecksumType(ChecksumType.HMAC_SHA512);
-            break;
-        default:
-            res.setChecksumType(ChecksumType.HMAC_MD5);
-            break;
+        switch (defaultChecksum) {
+            case SHA1:
+                res.setChecksumType(ChecksumType.HMAC_SHA1);
+                break;
+            case SHA256:
+                res.setChecksumType(ChecksumType.HMAC_SHA256);
+                break;
+            case SHA384:
+                res.setChecksumType(ChecksumType.HMAC_SHA384);
+                break;
+            case SHA512:
+                res.setChecksumType(ChecksumType.HMAC_SHA512);
+                break;
+            default:
+                res.setChecksumType(ChecksumType.HMAC_MD5);
+                break;
         }
-        
+
         String salt = UUID.randomUUID().toString();
         res.setChecksumSalt(Base16Utils.encodeBase16(salt));
-        
+
         return res;
     }
-    
+
     /**
      * Retrieves a random FileID from the integrity database.
+     *
      * @return The randomly found FileID.
      */
     private String getRandomFileId() {
         long numberOfFiles = context.getStore().getNumberOfFilesInCollection(collectionID);
-        if(numberOfFiles <= 0L) {
+        if (numberOfFiles <= 0L) {
             throw new IllegalStateException("No files in collection '" + collectionID + "'.");
         }
         long randomFileIndex = (new Random()).nextLong() % numberOfFiles;
         return context.getStore().getFileIDAtPosition(collectionID, randomFileIndex);
     }
-    
+
     /**
      * Performs the conversation with the pillars to retrieve the checksums.
+     *
      * @return The map between pillars and checksums.
      */
     private Map<String, String> requestSaltedChecksumForFileStep() {
-        log.info("Request the file '" + currentFileID + "' with the checksumspec ' " + currentChecksumSpec + "'.");
-        GetChecksumForFileStep step = new GetChecksumForFileStep(context.getCollector(),
-                context.getAlerter(), currentChecksumSpec, currentFileID, context.getSettings(), 
-                collectionID, integrityContributors);
+        log.info("Request the file '" + currentFileID + "' with the checksumSpecTYPE ' " + currentChecksumSpec + "'.");
+        GetChecksumForFileStep step = new GetChecksumForFileStep(context.getCollector(), context.getAlerter(), currentChecksumSpec,
+                currentFileID, context.getSettings(), collectionID, integrityContributors);
         performStep(step);
         return step.getResults();
     }
-    
+
     /**
      * Validates the map of the checksums to ensure, that they all align.
-     * @param checksums The map of checksums for 
+     *
+     * @param checksums The map of checksums for
      */
     private void validateChecksums(Map<String, String> checksums) {
-        if(checksums == null || checksums.isEmpty()) {
-            sendFailure("No checksums with checksumSpec '" + currentChecksumSpec + "' received for file '" 
-                    + currentFileID + "'.");
+        if (checksums == null || checksums.isEmpty()) {
+            sendFailure("No checksums with checksumSpec '" + currentChecksumSpec + "' received for file '" + currentFileID + "'.");
             return;
         }
         List<String> cs = new ArrayList<>();
-        for(Map.Entry<String, String> entry : checksums.entrySet()) {
-            if(!cs.contains(entry.getValue())) {
+        for (Map.Entry<String, String> entry : checksums.entrySet()) {
+            if (!cs.contains(entry.getValue())) {
                 cs.add(entry.getValue());
             }
         }
-        if(cs.size() > 1) {
-            sendFailure("Inconsistent salted checksum found for file '" + currentFileID + "' with checksumspec '" 
-                    + currentChecksumSpec.getChecksumType() + "' and salt '" 
-                    + Base16Utils.decodeBase16(currentChecksumSpec.getChecksumSalt()) 
-                    + "'. The pillars had the checksums: " + checksums);
+        if (cs.size() > 1) {
+            sendFailure("Inconsistent salted checksum found for file '" + currentFileID + "' with checksumSpecTYPE '" +
+                    currentChecksumSpec.getChecksumType() + "' and salt '" +
+                    Base16Utils.decodeBase16(currentChecksumSpec.getChecksumSalt()) + "'. The pillars had the checksums: " + checksums);
         } else {
-            String audit = "Validated salted checksum for file '" + currentFileID + "' with checksumspec '" 
-                    + currentChecksumSpec.getChecksumType() + "' and salt '" 
-                    + Base16Utils.decodeBase16(currentChecksumSpec.getChecksumSalt()) + "' for pillars: "
-                    + checksums.keySet();
+            String audit = "Validated salted checksum for file '" + currentFileID + "' with checksumSpecTYPE '" +
+                    currentChecksumSpec.getChecksumType() + "' and salt '" +
+                    Base16Utils.decodeBase16(currentChecksumSpec.getChecksumSalt()) + "' for pillars: " + checksums.keySet();
             log.info(audit);
-            context.getAuditManager().addAuditEvent(collectionID, currentFileID, 
-                    "IntegrityServiceWorkflow: " + this.getClass().getName(), audit, 
-                    "Integrity salted checksum check", FileAction.INTEGRITY_CHECK, null, null);
+            context.getAuditManager()
+                    .addAuditEvent(collectionID, currentFileID, "IntegrityServiceWorkflow: " + this.getClass().getName(), audit,
+                            "Integrity salted checksum check", FileAction.INTEGRITY_CHECK, null, null);
         }
     }
-    
+
     /**
      * Log, audit and send an alarm about the failure.
+     *
      * @param failureMessage The failure message.
      */
     private void sendFailure(String failureMessage) {
         log.warn("Failure in checksum salted checksum: " + failureMessage);
-        context.getAuditManager().addAuditEvent(collectionID, currentFileID, 
-                "IntegrityServiceWorkflow: " + this.getClass().getName(), failureMessage, 
-                "Integrity salted checksum check", FileAction.INTEGRITY_CHECK, null, null);
+        context.getAuditManager()
+                .addAuditEvent(collectionID, currentFileID, "IntegrityServiceWorkflow: " + this.getClass().getName(), failureMessage,
+                        "Integrity salted checksum check", FileAction.INTEGRITY_CHECK, null, null);
         context.getAlerter().integrityFailed(failureMessage, collectionID);
     }
 
-	@Override
-	public String getDescription() {
-	    if(currentFileID == null) {
-	        return "Can check a randomly selected file against a random salted checksum";
-	    } else {
-	        return "Is currently checking the file '" + currentFileID + "' with checksum '"
-	                + currentChecksumSpec + "'";
-	    }
-	}
+    @Override
+    public String getDescription() {
+        if (currentFileID == null) {
+            return "Can check a randomly selected file against a random salted checksum";
+        } else {
+            return "Is currently checking the file '" + currentFileID + "' with checksum '" + currentChecksumSpec + "'";
+        }
+    }
 }
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/WorkflowStatistic.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/WorkflowStatistic.java
index ce6ffc4cc..f5815a67e 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/WorkflowStatistic.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/WorkflowStatistic.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -22,13 +22,14 @@
 
 package org.bitrepository.integrityservice.workflow;
 
+import org.bitrepository.common.utils.TimeUtils;
+
 import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
-import org.bitrepository.common.utils.TimeUtils;
 
 /**
- * Provides details about the statistics of an workflow. The statistics will not be fully populated until the
+ * Provides details about the statistics of a workflow. The statistics will not be fully populated until the
  * workflow has finished.
  */
 public class WorkflowStatistic {
@@ -41,6 +42,7 @@ public class WorkflowStatistic {
 
     /**
      * Creates a fresh <code>WorkflowStatistic</code> instance.
+     *
      * @param name The name of this instance to be used as title for the statistics.
      */
     public WorkflowStatistic(String name) {
@@ -55,8 +57,9 @@ public void start() {
     }
 
     /**
-     * Marks the start time of a sub step of the statistics statistics.
-     * @param name The name of the substep to be used as identifier in the statistics.
+     * Marks the start time of a sub step of the statistics.
+     *
+     * @param name The name of the sub-step to be used as identifier in the statistics.
      */
     public void startSubStatistic(String name) {
         subStatistics.add(new WorkflowStatistic(name));
@@ -64,23 +67,23 @@ public void startSubStatistic(String name) {
     }
 
     /**
-     * Marks the end time of a sub step of the statistics statistics.
+     * Marks the end time of a sub step of the statistics.
      */
     public void finishSubStatistic() {
         getCurrentSubStatistic().finish();
     }
 
     /**
-     * @return A string representation of statistics, including all substatistics.
+     * @return A string representation of statistics, including all sub-statistics.
      */
     public String getFullStatistics() {
         if (start == null) {
             return "Haven't finished a run yet";
         }
         StringBuilder sb = new StringBuilder();
-        sb.append(getName() + " duration: " + TimeUtils.millisecondsToHuman(getDuration()));
-        for (WorkflowStatistic stepStat: subStatistics) {
-            sb.append(LINEFEED +stepStat.getFullStatistics());
+        sb.append(getName()).append(" duration: ").append(TimeUtils.millisecondsToHuman(getDuration()));
+        for (WorkflowStatistic stepStat : subStatistics) {
+            sb.append(LINEFEED).append(stepStat.getFullStatistics());
         }
         return sb.toString();
     }
@@ -88,31 +91,31 @@ public String getFullStatistics() {
     /**
      * Will generate a string of the form 'step duration'/'workflow duration'. If the workflow isn't running
      * a "Not running" string will be returned.
+     *
      * @return a string of the form 'step duration'/'workflow duration'
      */
     public String getPartStatistics() {
         if (start == null) {
             return "Not started yet";
-        }
-        else if (finish != null ) {
+        } else if (finish != null) {
             return "Idle";
         } else {
             WorkflowStatistic currentSubStatistic = getCurrentSubStatistic();
-            return currentSubStatistic.getName() + LINEFEED +
-                    "Running for " +
-                    TimeUtils.millisecondsToHuman(currentSubStatistic.getDuration()) + "/" +
-                    TimeUtils.millisecondsToHuman(getDuration()) + ")";
+            return currentSubStatistic.getName() + LINEFEED + "Running for " +
+                    TimeUtils.millisecondsToHuman(currentSubStatistic.getDuration()) + "/" + TimeUtils.millisecondsToHuman(getDuration()) +
+                    ")";
         }
     }
 
     /**
      * Will return the statistics for the current step if the workflow statistics have an active step.
+     *
      * @return the statistics for the current step
      */
     public WorkflowStatistic getCurrentSubStatistic() {
         if (subStatistics.isEmpty() || finish != null) {
             return null;
-        } else return subStatistics.get(subStatistics.size()-1);
+        } else return subStatistics.get(subStatistics.size() - 1);
     }
 
     public Date getStart() {
@@ -122,6 +125,7 @@ public Date getStart() {
     public Date getFinish() {
         return finish;
     }
+
     public void finish() {
         this.finish = new Date();
     }
@@ -146,11 +150,7 @@ private long getDuration() {
 
     @Override
     public String toString() {
-        return "WorkflowStatistic{" +
-                "name='" + name + '\'' +
-                ", start=" + start +
-                ", finish=" + finish +
-                ", subStatistics=" + subStatistics +
-                '}';
+        return "WorkflowStatistic{" + "name='" + name + '\'' + ", start=" + start + ", finish=" + finish + ", subStatistics=" +
+                subStatistics + '}';
     }
 }
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/CreateStatisticsEntryStep.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/CreateStatisticsEntryStep.java
index a703835ca..40427b1f3 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/CreateStatisticsEntryStep.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/CreateStatisticsEntryStep.java
@@ -5,48 +5,46 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.integrityservice.workflow.step;
 
-import java.util.List;
-import java.util.Map;
-
 import org.bitrepository.common.utils.SettingsUtils;
 import org.bitrepository.integrityservice.cache.IntegrityModel;
 import org.bitrepository.integrityservice.cache.PillarCollectionMetric;
 import org.bitrepository.integrityservice.statistics.StatisticsCollector;
 import org.bitrepository.service.workflow.AbstractWorkFlowStep;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * A workflow step for finding missing checksums.
  * Uses the IntegrityChecker to perform the actual check.
  */
 public class CreateStatisticsEntryStep extends AbstractWorkFlowStep {
-    /** The Integrity Model. */
     private final IntegrityModel store;
-    /** The collectionID */
     private final String collectionID;
     private final StatisticsCollector sc;
-    
+
     public CreateStatisticsEntryStep(IntegrityModel store, String collectionID, StatisticsCollector statisticsCollector) {
-        this.store = store;        
+        this.store = store;
         this.collectionID = collectionID;
         this.sc = statisticsCollector;
     }
-    
+
     @Override
     public String getName() {
         return "Create statistics";
@@ -60,20 +58,20 @@ public String getName() {
     public synchronized void performStep() {
         List<String> pillars = SettingsUtils.getPillarIDsForCollection(collectionID);
         Map<String, PillarCollectionMetric> pillarMetrics = store.getPillarCollectionMetrics(collectionID);
-        for(String pillar : pillars) {
+        for (String pillar : pillars) {
             PillarCollectionMetric metric = pillarMetrics.get(pillar);
-            if(metric == null) {
+            if (metric == null) {
                 sc.getPillarCollectionStat(pillar).setFileCount(0L);
                 sc.getPillarCollectionStat(pillar).setDataSize(0L);
             } else {
                 sc.getPillarCollectionStat(pillar).setFileCount(metric.getPillarFileCount());
-                sc.getPillarCollectionStat(pillar).setDataSize(metric.getPillarCollectionSize());    
+                sc.getPillarCollectionStat(pillar).setDataSize(metric.getPillarCollectionSize());
             }
         }
         sc.getCollectionStat().setFileCount(store.getNumberOfFilesInCollection(collectionID));
         sc.getCollectionStat().setDataSize(store.getCollectionFileSize(collectionID));
         sc.getCollectionStat().setLatestFileTime(store.getDateForNewestFileEntryForCollection(collectionID));
-        
+
         store.createStatistics(collectionID, sc);
     }
 
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/FullUpdateChecksumsStep.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/FullUpdateChecksumsStep.java
index 6356300da..1270551a0 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/FullUpdateChecksumsStep.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/FullUpdateChecksumsStep.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -32,9 +32,9 @@
  * Workflow step class to handle the full collection of checksums.
  */
 public class FullUpdateChecksumsStep extends UpdateChecksumsStep {
-
     public FullUpdateChecksumsStep(IntegrityInformationCollector collector, IntegrityModel store, IntegrityAlerter alerter,
-            ChecksumSpecTYPE checksumType, Settings settings, String collectionID, IntegrityContributors integrityContributors) {
+                                   ChecksumSpecTYPE checksumType, Settings settings, String collectionID,
+                                   IntegrityContributors integrityContributors) {
         super(collector, store, alerter, checksumType, settings, collectionID, integrityContributors);
     }
 
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/FullUpdateFileIDsStep.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/FullUpdateFileIDsStep.java
index 8e3ce5373..7b37a73d2 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/FullUpdateFileIDsStep.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/FullUpdateFileIDsStep.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -29,8 +29,9 @@
 
 public class FullUpdateFileIDsStep extends UpdateFileIDsStep {
 
-    public FullUpdateFileIDsStep(IntegrityInformationCollector collector, IntegrityModel store, 
-            IntegrityAlerter alerter, Settings settings, String collectionID, IntegrityContributors integrityContributors) {
+    public FullUpdateFileIDsStep(IntegrityInformationCollector collector, IntegrityModel store,
+                                 IntegrityAlerter alerter, Settings settings, String collectionID,
+                                 IntegrityContributors integrityContributors) {
         super(collector, store, alerter, settings, collectionID, integrityContributors);
     }
 
@@ -38,7 +39,7 @@ public FullUpdateFileIDsStep(IntegrityInformationCollector collector, IntegrityM
     public String getName() {
         return "Collect all fileIDs from pillars";
     }
-    
+
     @Override
     protected void initialStepAction() {
         store.resetFileCollectionProgress(collectionID);
@@ -51,5 +52,5 @@ protected void initialStepAction() {
     public static String getDescription() {
         return "Contacts all pillar to retrieve the full list of files from the pillars";
     }
-    
+
 }
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/GetChecksumForFileStep.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/GetChecksumForFileStep.java
index a0a2f29ae..6652b2090 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/GetChecksumForFileStep.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/GetChecksumForFileStep.java
@@ -5,26 +5,22 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.integrityservice.workflow.step;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
 import org.bitrepository.bitrepositoryelements.ChecksumSpecTYPE;
 import org.bitrepository.bitrepositoryelements.ResultingChecksums;
 import org.bitrepository.client.eventhandler.OperationEvent;
@@ -41,64 +37,56 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
 /**
  * The step for collecting the checksums of a specific file from the pillars.
  */
 public class GetChecksumForFileStep extends AbstractWorkFlowStep {
-    /** The log.*/
     private final Logger log = LoggerFactory.getLogger(getClass());
-    
-    /** The collector for retrieving the checksums.*/
     private final IntegrityInformationCollector collector;
-    /** The checksum spec type.*/
     private final ChecksumSpecTYPE checksumType;
-    /** The integrity alerter.*/
     private final IntegrityAlerter alerter;
-    /** The timeout for waiting for the results of the GetChecksums operation.*/
     private final Long timeout;
-    /** The ID of the file to retrieve the checksum of.*/
     protected final String fileID;
-    /** The collectionID */
     protected final String collectionID;
-    /** Contributors for collecting information */
     private final IntegrityContributors integrityContributors;
-    /** Map between pillar and their checksum results. */
     private Map<String, ResultingChecksums> checksumResults = null;
-    
+
     /**
-     * Constructor.
-     * @param collector The client for collecting the checksums.
-     * @param alerter The alerter for sending failures.
-     * @param checksumType The type of checksum to collect.
-     * @param fileID The ID of the file to request.
-     * @param settings The settings.
-     * @param collectionID The id of the collection.
+     * @param collector             The client for collecting the checksums.
+     * @param alerter               The alerter for sending failures.
+     * @param checksumType          The type of checksum to collect.
+     * @param fileID                The ID of the file to request.
+     * @param settings              The settings.
+     * @param collectionID          The id of the collection.
      * @param integrityContributors The contributors, who should be asked for the checksum.
      */
-    public GetChecksumForFileStep(IntegrityInformationCollector collector, IntegrityAlerter alerter,
-            ChecksumSpecTYPE checksumType, String fileID, Settings settings, String collectionID, IntegrityContributors integrityContributors) {
+    public GetChecksumForFileStep(IntegrityInformationCollector collector, IntegrityAlerter alerter, ChecksumSpecTYPE checksumType,
+                                  String fileID, Settings settings, String collectionID, IntegrityContributors integrityContributors) {
         this.collector = collector;
         this.checksumType = checksumType;
         this.alerter = alerter;
         this.collectionID = collectionID;
         this.fileID = fileID;
         this.integrityContributors = integrityContributors;
-        this.timeout = settings.getRepositorySettings().getClientSettings().getIdentificationTimeout().longValue()
-                + settings.getRepositorySettings().getClientSettings().getOperationTimeout().longValue();
+        this.timeout = settings.getRepositorySettings().getClientSettings().getIdentificationTimeout().longValue() +
+                settings.getRepositorySettings().getClientSettings().getOperationTimeout().longValue();
     }
-    
+
     @Override
     public synchronized void performStep() throws WorkflowAbortedException {
         try {
-            Set<String> pillarsToCollectFrom =  integrityContributors.getActiveContributors();
-            log.debug("Collecting checksums from '" + pillarsToCollectFrom + "' for collection '" 
-                    + collectionID + "'.");
+            Set<String> pillarsToCollectFrom = integrityContributors.getActiveContributors();
+            log.debug("Collecting checksums from '" + pillarsToCollectFrom + "' for collection '" + collectionID + "'.");
             SimpleChecksumEventHandler eventHandler = new SimpleChecksumEventHandler(timeout, integrityContributors);
-            collector.getChecksums(collectionID, pillarsToCollectFrom, checksumType, fileID, "Getting salted " 
-                    + checksumType.getChecksumType() + " checksum for spot integrity check", null, eventHandler);
-            
+            collector.getChecksums(collectionID, pillarsToCollectFrom, checksumType, fileID,
+                    "Getting salted " + checksumType.getChecksumType() + " checksum for spot integrity check", null, eventHandler);
+
             OperationEvent event = eventHandler.getFinish();
-            if(event.getEventType() == OperationEventType.FAILED) {
+            if (event.getEventType() == OperationEventType.FAILED) {
                 handleFailureEvent(event);
             }
             log.debug("Collecting of checksums had the final event: " + event);
@@ -107,39 +95,39 @@ public synchronized void performStep() throws WorkflowAbortedException {
             log.warn("Interrupted while collecting checksums.", e);
         }
     }
-    
+
     /**
-     * Handle a failure event. This includes checking if any contributors have failed (if not just retry), 
-     * checking to see if the workflow should be aborted, and sending alarms if needed.  
+     * Handle a failure event. This includes checking if any contributors have failed (if not just retry),
+     * checking to see if the workflow should be aborted, and sending alarms if needed.
      */
     private void handleFailureEvent(OperationEvent event) {
-        if(integrityContributors.getFailedContributors().isEmpty()) {
+        if (integrityContributors.getFailedContributors().isEmpty()) {
             log.info("Get failure event, but no contributors marked as failed.");
         } else {
             OperationFailedEvent ofe = (OperationFailedEvent) event;
-            log.info("Failure occured collecting checksums. Failure {}", ofe.toString());
-            alerter.integrityFailed("Failure while collecting checksums, the check will continue "
-                    + "with the information available. The failed contributors were: " 
-                    + integrityContributors.getFailedContributors(), collectionID);
+            log.info("Failure occurred collecting checksums. Failure {}", ofe.toString());
+            alerter.integrityFailed("Failure while collecting checksums, the check will continue " +
+                            "with the information available. The failed contributors were: " + integrityContributors.getFailedContributors(),
+                    collectionID);
         }
     }
-    
+
     /**
-     * Extracts the results from the conversation. 
+     * Extracts the results from the conversation.
+     *
      * @return The map between pillars and their checksum for the file.
      */
     public Map<String, String> getResults() {
-        if(checksumResults == null) {
+        if (checksumResults == null) {
             return null;
         }
         Map<String, String> res = new HashMap<>();
-        for(Map.Entry<String, ResultingChecksums> entry : checksumResults.entrySet()) {
-            if(!validateResults(entry.getValue())) {
+        for (Map.Entry<String, ResultingChecksums> entry : checksumResults.entrySet()) {
+            if (!validateResults(entry.getValue())) {
                 log.warn("No or invalid checksum results from pillar '" + entry.getKey() + "': " + entry.getValue());
                 continue;
             }
-            String checksum = Base16Utils.decodeBase16(
-                    entry.getValue().getChecksumDataItems().get(0).getChecksumValue());
+            String checksum = Base16Utils.decodeBase16(entry.getValue().getChecksumDataItems().get(0).getChecksumValue());
             res.put(entry.getKey(), checksum);
         }
         return res;
@@ -147,12 +135,13 @@ public Map<String, String> getResults() {
 
     /**
      * Check whether the entry exists and that it is for the right file.
-     * (If more than one results is given, then the first must be the requested file). 
+     * (If more than one results is given, then the first must be the requested file).
+     *
      * @param checksumData The resulting checksum data to validate.
      * @return Whether it is valid.
      */
     private boolean validateResults(ResultingChecksums checksumData) {
-        if(checksumData.getChecksumDataItems().isEmpty()) {
+        if (checksumData.getChecksumDataItems().isEmpty()) {
             return false;
         }
         return checksumData.getChecksumDataItems().get(0).getFileID().equalsIgnoreCase(fileID);
@@ -160,8 +149,7 @@ private boolean validateResults(ResultingChecksums checksumData) {
 
     @Override
     public String getName() {
-        return "Performing the GetChecksum for file '" + fileID + "' with the algorithm '" 
-                + checksumType.getChecksumType() + "' and salt '" + Base16Utils.decodeBase16(
-                        checksumType.getChecksumSalt()) + "'.";
+        return "Performing the GetChecksum for file '" + fileID + "' with the algorithm '" + checksumType.getChecksumType() +
+                "' and salt '" + Base16Utils.decodeBase16(checksumType.getChecksumSalt()) + "'.";
     }
 }
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/GetFileStep.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/GetFileStep.java
index ae7839260..22df765e9 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/GetFileStep.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/GetFileStep.java
@@ -5,50 +5,44 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.integrityservice.workflow.step;
 
-import java.net.URL;
-
 import org.bitrepository.client.eventhandler.OperationEvent;
 import org.bitrepository.client.eventhandler.OperationEvent.OperationEventType;
 import org.bitrepository.integrityservice.collector.IntegrityEventCompleteAwaiter;
 import org.bitrepository.integrityservice.workflow.IntegrityWorkflowContext;
 import org.bitrepository.service.workflow.AbstractWorkFlowStep;
 
+import java.net.URL;
+
 /**
  * Workflow step to perform the GetFile operation.
  */
 public class GetFileStep extends AbstractWorkFlowStep {
-
-    /** The context for the integrity workflow.*/
     protected final IntegrityWorkflowContext context;
-    /** The collectionID */
     protected final String collectionId;
-    /** The id of the file to retrieve.*/
     private final String fileId;
-    /** The URL for the GetFile operation to have the file delivered at. */
     private final URL uploadUrl;
 
     /**
-     * Constructor.
-     * @param context The context for the workflow.
+     * @param context      The context for the workflow.
      * @param collectionId The id of the collection to get the file from.
-     * @param fileId The id of the file to get.
-     * @param uploadUrl The URL where the file must be delivered.
+     * @param fileId       The id of the file to get.
+     * @param uploadUrl    The URL where the file must be delivered.
      */
     public GetFileStep(IntegrityWorkflowContext context, String collectionId, String fileId, URL uploadUrl) {
         this.context = context;
@@ -65,13 +59,13 @@ public String getName() {
     @Override
     public void performStep() {
         IntegrityEventCompleteAwaiter eventHandler = new IntegrityEventCompleteAwaiter(context.getSettings());
-        context.getCollector().getFile(collectionId, fileId, uploadUrl, eventHandler, "IntegrityService: " 
+        context.getCollector().getFile(collectionId, fileId, uploadUrl, eventHandler, "IntegrityService: "
                 + getName());
 
         OperationEvent event = eventHandler.getFinish();
-        if(event.getEventType() == OperationEventType.FAILED) {
+        if (event.getEventType() == OperationEventType.FAILED) {
             throw new IllegalStateException("Aborting workflow due to failure getting the file '" + fileId + "'. "
-                    + "Cause: " + event.toString());
+                    + "Cause: " + event);
         }
     }
 }
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/HandleChecksumValidationStep.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/HandleChecksumValidationStep.java
index fe95a5d1b..6480bf704 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/HandleChecksumValidationStep.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/HandleChecksumValidationStep.java
@@ -5,30 +5,22 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.integrityservice.workflow.step;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
 import org.bitrepository.bitrepositoryelements.FileAction;
 import org.bitrepository.common.utils.SettingsUtils;
 import org.bitrepository.integrityservice.cache.FileInfo;
@@ -39,39 +31,40 @@
 import org.bitrepository.service.audit.AuditTrailManager;
 import org.bitrepository.service.exception.StepFailedException;
 import org.bitrepository.service.workflow.AbstractWorkFlowStep;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
 
 /**
  * A workflow step for finding inconsistency between the checksums.
  */
 public class HandleChecksumValidationStep extends AbstractWorkFlowStep {
-    /** The log.*/
-    private final Logger log = LoggerFactory.getLogger(getClass());
-    /** The Integrity Model. */
     private final IntegrityModel store;
-    /** The report model to populate. */
     private final IntegrityReporter reporter;
-    /** The audit trail manager.*/
     private final AuditTrailManager auditManager;
     private final StatisticsCollector sc;
     private final Map<String, Long> pillarChecksumErrors;
     private Long allPillarChecksumErrors = 0L;
-    private Long collectionChecksumErrors = 0L; 
-    
-    public HandleChecksumValidationStep(IntegrityModel store, AuditTrailManager auditManager, 
-            IntegrityReporter reporter, StatisticsCollector statisticsCollector) {
+    private Long collectionChecksumErrors = 0L;
+
+    public HandleChecksumValidationStep(IntegrityModel store, AuditTrailManager auditManager, IntegrityReporter reporter,
+                                        StatisticsCollector statisticsCollector) {
         this.store = store;
         this.auditManager = auditManager;
         this.reporter = reporter;
         this.sc = statisticsCollector;
         pillarChecksumErrors = new HashMap<>();
         List<String> pillars = SettingsUtils.getPillarIDsForCollection(reporter.getCollectionID());
-        for(String pillar : pillars) {
+        for (String pillar : pillars) {
             pillarChecksumErrors.put(pillar, 0L);
         }
     }
-    
+
     @Override
     public String getName() {
         return "Handle validation of checksums.";
@@ -82,18 +75,14 @@ public String getName() {
      */
     @Override
     public synchronized void performStep() throws StepFailedException {
-        IntegrityIssueIterator inconsistentFilesIterator 
-            = store.getFilesWithInconsistentChecksums(reporter.getCollectionID());
-        String fileID;
-        try {
-            while((fileID = inconsistentFilesIterator.getNextIntegrityIssue()) != null) {
+        try (IntegrityIssueIterator inconsistentFilesIterator = store.getFilesWithInconsistentChecksums(reporter.getCollectionID())) {
+            String fileID;
+            while ((fileID = inconsistentFilesIterator.getNextIntegrityIssue()) != null) {
                 handleChecksumInconsistency(store.getFileInfos(fileID, reporter.getCollectionID()), fileID);
                 collectionChecksumErrors++;
             }
-        } finally {
-            inconsistentFilesIterator.close();
         }
-        for(Entry<String, Long> entry : pillarChecksumErrors.entrySet()) {
+        for (Entry<String, Long> entry : pillarChecksumErrors.entrySet()) {
             sc.getPillarCollectionStat(entry.getKey()).setChecksumErrors(entry.getValue() + allPillarChecksumErrors);
         }
         sc.getCollectionStat().setChecksumErrors(collectionChecksumErrors);
@@ -101,12 +90,13 @@ public synchronized void performStep() throws StepFailedException {
 
     /**
      * Locates the source of the checksum inconsistency.
-     * If only a single pillar is inconsistent with the majority, then it alone will be set to checksum error for the 
+     * If only a single pillar is inconsistent with the majority, then it alone will be set to checksum error for the
      * file.
      * Otherwise all the pillars will be set to checksum error for the file.
-     * @param infos The FileInfos
+     *
+     * @param infos  The FileInfos
      * @param fileID The id of the file.
-     * @throws StepFailedException 
+     * @throws StepFailedException Throws an exception if failed to report the file as having a checksum issue.
      */
     private void handleChecksumInconsistency(Collection<FileInfo> infos, String fileID) throws StepFailedException {
         Map<String, List<String>> checksumMap = getChecksumMapping(infos);
@@ -114,55 +104,55 @@ private void handleChecksumInconsistency(Collection<FileInfo> infos, String file
 
         createAuditForInconsistentChecksum(pillarID, fileID);
         try {
-            if(pillarID == null) {
+            if (pillarID == null) {
                 allPillarChecksumErrors++;
-                for(FileInfo info : infos) {
+                for (FileInfo info : infos) {
                     reporter.reportChecksumIssue(fileID, info.getPillarId());
                 }
             } else {
                 pillarChecksumErrors.put(pillarID, pillarChecksumErrors.get(pillarID) + 1);
                 reporter.reportChecksumIssue(fileID, pillarID);
-            }    
+            }
         } catch (IOException e) {
             throw new StepFailedException("Failed to report file: " + fileID + " as having a checksum issue", e);
         }
-        
+
     }
-    
+
     /**
      * Creates a audit-trail for inconsistency between checksums.
-     * If only one pillar is alone with a checksum compared to all the others, then it is pointed out at the possible 
+     * If only one pillar is alone with a checksum compared to all the others, then it is pointed out at the possible
      * cause.
+     *
      * @param pillarID The id of the pillar, which is inconsistent with the other pillars. Or null, if no single pillar
-     * is causing the inconsistency.
-     * @param fileID The id of the file.
+     *                 is causing the inconsistency.
+     * @param fileID   The id of the file.
      */
     private void createAuditForInconsistentChecksum(String pillarID, String fileID) {
         String auditText;
-        
-        if(pillarID != null) {
-            auditText = "Checksum inconsistency for the file '" + fileID + "' at collection '"
-                    + reporter.getCollectionID() + "'. Possibly corrupt at pillar '" + pillarID
-                    + "', since all the other pillars agree upon another checksum.";
+
+        if (pillarID != null) {
+            auditText = "Checksum inconsistency for the file '" + fileID + "' at collection '" + reporter.getCollectionID() +
+                    "'. Possibly corrupt at pillar '" + pillarID + "', since all the other pillars agree upon another checksum.";
         } else {
-            auditText = "Checksum inconsistency for the file '" + fileID + "' at collection '"
-                    + reporter.getCollectionID() + "'. The pillars have registered more than one unique "
-                    + "checksum for the file.";
+            auditText = "Checksum inconsistency for the file '" + fileID + "' at collection '" + reporter.getCollectionID() +
+                    "'. The pillars have registered more than one unique " + "checksum for the file.";
         }
-        auditManager.addAuditEvent(reporter.getCollectionID(), fileID, "IntegrityService",
-                auditText, "IntegrityService validating the checksums.", FileAction.INCONSISTENCY, null, null);
+        auditManager.addAuditEvent(reporter.getCollectionID(), fileID, "IntegrityService", auditText,
+                "IntegrityService validating the checksums.", FileAction.INCONSISTENCY, null, null);
     }
-    
+
     /**
      * Retrieves the mapping between the checksums and the pillars, e.g. which pillars have a given checksum.
-     * @param infos The information about a given file at all the pillars. 
+     *
+     * @param infos The information about a given file at all the pillars.
      * @return The mapping between checksums and the pillars with that checksum.
      */
     private Map<String, List<String>> getChecksumMapping(Collection<FileInfo> infos) {
         Map<String, List<String>> checksumMap = new HashMap<>();
-        for(FileInfo info : infos) {
+        for (FileInfo info : infos) {
             List<String> pillarIDsForChecksum;
-            if(checksumMap.containsKey(info.getChecksum())) {
+            if (checksumMap.containsKey(info.getChecksum())) {
                 pillarIDsForChecksum = checksumMap.get(info.getChecksum());
             } else {
                 pillarIDsForChecksum = new ArrayList<>();
@@ -170,31 +160,32 @@ private Map<String, List<String>> getChecksumMapping(Collection<FileInfo> infos)
             pillarIDsForChecksum.add(info.getPillarId());
             checksumMap.put(info.getChecksum(), pillarIDsForChecksum);
         }
-        
+
         return checksumMap;
     }
-    
+
     /**
      * Tries to find a single pillar, who causes the inconsistency, otherwise a null is returned.
-     * This pillar must be alone with its checksum, whereas all the other pillars (minimum 2 other pillars) must 
-     * agree upon another checksum. 
+     * This pillar must be alone with its checksum, whereas all the other pillars (minimum 2 other pillars) must
+     * agree upon another checksum.
+     *
      * @param checksumMap The mapping between checksums and the pillars with that checksum.
      * @return The id of the pillar possibly causing the inconsistency, or null if no single pillar can be found.
      */
     private String findSingleInconsistentPillar(Map<String, List<String>> checksumMap) {
-        if(checksumMap.size() != 2) {
+        if (checksumMap.size() != 2) {
             return null;
         }
         List<List<String>> pillarLists = new ArrayList<>(checksumMap.values());
-        
-        if((pillarLists.get(0).size() > 1) && (pillarLists.get(1).size() > 1)) {
+
+        if ((pillarLists.get(0).size() > 1) && (pillarLists.get(1).size() > 1)) {
             return null;
         }
-        if((pillarLists.get(0).size() == 1) && (pillarLists.get(1).size() == 1)) {
+        if ((pillarLists.get(0).size() == 1) && (pillarLists.get(1).size() == 1)) {
             return null;
         }
-        
-        if(pillarLists.get(0).size() == 1) {
+
+        if (pillarLists.get(0).size() == 1) {
             return pillarLists.get(0).get(0);
         } else {
             return pillarLists.get(1).get(0);
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/HandleDeletedFilesStep.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/HandleDeletedFilesStep.java
index 3cd360449..c482f1678 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/HandleDeletedFilesStep.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/HandleDeletedFilesStep.java
@@ -5,58 +5,50 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.integrityservice.workflow.step;
 
-import java.io.IOException;
-import java.util.Date;
-import java.util.Set;
-
 import org.bitrepository.integrityservice.cache.IntegrityModel;
 import org.bitrepository.integrityservice.cache.database.IntegrityIssueIterator;
 import org.bitrepository.integrityservice.reports.IntegrityReporter;
 import org.bitrepository.service.exception.StepFailedException;
 import org.bitrepository.service.workflow.AbstractWorkFlowStep;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.util.Date;
+import java.util.Set;
 
 /**
  * A workflow step for removing files no longer present.
  * Uses the IntegrityChecker to perform the actual check.
  */
 public class HandleDeletedFilesStep extends AbstractWorkFlowStep {
-    /** The log.*/
-    private Logger log = LoggerFactory.getLogger(getClass());
-    /** The Integrity Model. */
     private final IntegrityModel store;
-    /** The report model to populate */
     private final IntegrityReporter reporter;
-    /** Start time of the workflow. */
     private final Date workflowStart;
-    /** Pillars to clean. */
     private final Set<String> pillarsToClean;
-    
-    public HandleDeletedFilesStep(IntegrityModel store, IntegrityReporter reporter, Date workflowStart, 
-            Set<String> pillarsToClean) {
+
+    public HandleDeletedFilesStep(IntegrityModel store, IntegrityReporter reporter, Date workflowStart,
+                                  Set<String> pillarsToClean) {
         this.store = store;
         this.reporter = reporter;
         this.workflowStart = workflowStart;
         this.pillarsToClean = pillarsToClean;
     }
-    
+
     @Override
     public String getName() {
         return "Handle files that's no longer in the collection.";
@@ -67,12 +59,11 @@ public String getName() {
      */
     @Override
     public synchronized void performStep() throws StepFailedException {
-        for(String pillar : pillarsToClean) {
-            IntegrityIssueIterator deletedFilesIterator = store.findOrphanFiles(reporter.getCollectionID(), 
-                    pillar, workflowStart);
-            String deletedFile;
-            try {
-                while((deletedFile = deletedFilesIterator.getNextIntegrityIssue()) != null) {
+        for (String pillar : pillarsToClean) {
+            try (IntegrityIssueIterator deletedFilesIterator = store.findOrphanFiles(reporter.getCollectionID(),
+                    pillar, workflowStart)) {
+                String deletedFile;
+                while ((deletedFile = deletedFilesIterator.getNextIntegrityIssue()) != null) {
                     store.deleteFileIdEntry(reporter.getCollectionID(), pillar, deletedFile);
                     try {
                         reporter.reportDeletedFile(pillar, deletedFile);
@@ -80,9 +71,7 @@ public synchronized void performStep() throws StepFailedException {
                         throw new StepFailedException("Failed to report file: " + deletedFile + " as deleted", e);
                     }
                 }
-            } finally {
-                deletedFilesIterator.close();
-            }    
+            }
         }
     }
 
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/HandleMissingChecksumsStep.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/HandleMissingChecksumsStep.java
index f8f384659..bc0339467 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/HandleMissingChecksumsStep.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/HandleMissingChecksumsStep.java
@@ -5,26 +5,22 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.integrityservice.workflow.step;
 
-import java.io.IOException;
-import java.util.Date;
-import java.util.List;
-
 import org.bitrepository.common.utils.SettingsUtils;
 import org.bitrepository.integrityservice.cache.IntegrityModel;
 import org.bitrepository.integrityservice.cache.database.IntegrityIssueIterator;
@@ -32,31 +28,29 @@
 import org.bitrepository.integrityservice.statistics.StatisticsCollector;
 import org.bitrepository.service.exception.StepFailedException;
 import org.bitrepository.service.workflow.AbstractWorkFlowStep;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.util.Date;
+import java.util.List;
 
 /**
  * A workflow step for finding missing checksums.
  * Uses the IntegrityChecker to perform the actual check.
  */
 public class HandleMissingChecksumsStep extends AbstractWorkFlowStep {
-    /** The log.*/
-    private Logger log = LoggerFactory.getLogger(getClass());
-    /** The Integrity Model. */
     private final IntegrityModel store;
-    /** The report model to populate. */
     private final IntegrityReporter reporter;
     private final StatisticsCollector sc;
     private final Date cutoff;
-    
-    public HandleMissingChecksumsStep(IntegrityModel store, IntegrityReporter reporter, 
-            StatisticsCollector statisticsCollector, Date latestChecksumUpdate) {
+
+    public HandleMissingChecksumsStep(IntegrityModel store, IntegrityReporter reporter, StatisticsCollector statisticsCollector,
+                                      Date latestChecksumUpdate) {
         this.store = store;
         this.reporter = reporter;
         this.sc = statisticsCollector;
         this.cutoff = latestChecksumUpdate;
     }
-    
+
     @Override
     public String getName() {
         return "Handle missing checksums reporting.";
@@ -64,21 +58,22 @@ public String getName() {
 
     /**
      * Queries the IntegrityModel for files with missing checksums. Reports them if any is returned.
-     * @throws StepFailedException if the report file could not be written
+     *
+     * @throws StepFailedException   if the report file could not be written
      * @throws IllegalStateException if there was a problem with the database
      */
     @Override
     public synchronized void performStep() throws StepFailedException {
         List<String> pillars = SettingsUtils.getPillarIDsForCollection(reporter.getCollectionID());
 
-        for(String pillar : pillars) {
+        for (String pillar : pillars) {
             Long missingChecksums = 0L;
 
-            
+
             String missingFile;
-            try (IntegrityIssueIterator missingChecksumsIterator
-                         = store.findFilesWithMissingChecksum(reporter.getCollectionID(), pillar, cutoff)){
-                while((missingFile = missingChecksumsIterator.getNextIntegrityIssue()) != null) {
+            try (IntegrityIssueIterator missingChecksumsIterator = store.findFilesWithMissingChecksum(reporter.getCollectionID(), pillar,
+                    cutoff)) {
+                while ((missingFile = missingChecksumsIterator.getNextIntegrityIssue()) != null) {
                     try {
                         reporter.reportMissingChecksum(missingFile, pillar);
                         missingChecksums++;
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/HandleMissingFilesStep.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/HandleMissingFilesStep.java
index 198e7373d..adb2e93c8 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/HandleMissingFilesStep.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/HandleMissingFilesStep.java
@@ -5,31 +5,22 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.integrityservice.workflow.step;
 
-import java.io.IOException;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
 import org.bitrepository.common.utils.SettingsUtils;
 import org.bitrepository.integrityservice.cache.FileInfo;
 import org.bitrepository.integrityservice.cache.IntegrityModel;
@@ -41,63 +32,67 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
 /**
  * A workflow step for finding missing files.
  * Uses the IntegrityChecker to perform the actual check.
  */
 public class HandleMissingFilesStep extends AbstractWorkFlowStep {
-    /** The log.*/
-    private Logger log = LoggerFactory.getLogger(getClass());
-    /** The Integrity Model. */
+    private final Logger log = LoggerFactory.getLogger(getClass());
     private final IntegrityModel store;
-    /** The report model to populate. */
     private final IntegrityReporter reporter;
     private final StatisticsCollector sc;
-    /** The period in which a file should not be considered as missing. */
     private final Long gracePeriod;
-    
-    public HandleMissingFilesStep(IntegrityModel store, IntegrityReporter reporter, 
-            StatisticsCollector statisticsCollector, Long missingFileGracePeriod) {
+
+    public HandleMissingFilesStep(IntegrityModel store, IntegrityReporter reporter, StatisticsCollector statisticsCollector,
+                                  Long missingFileGracePeriod) {
         this.store = store;
         this.reporter = reporter;
         this.sc = statisticsCollector;
         this.gracePeriod = missingFileGracePeriod;
     }
-    
+
     @Override
     public String getName() {
         return "Handle check for missing files.";
     }
 
     /**
-     * Queries the IntegrityModel for inconsistent checksums in the collection. 
-     * Checks every reported inconsistent checksum, to verify that it's actually inconsistent. 
-     * Updates database model to reflect the discovered situation. 
+     * Queries the IntegrityModel for inconsistent checksums in the collection.
+     * Checks every reported inconsistent checksum, to verify that it's actually inconsistent.
+     * Updates database model to reflect the discovered situation.
      */
     @Override
     public synchronized void performStep() throws StepFailedException {
         List<String> pillars = SettingsUtils.getPillarIDsForCollection(reporter.getCollectionID());
         Map<String, Long> missingFilesMap = new HashMap<>();
-        for(String pillar : pillars) {
+        for (String pillar : pillars) {
             missingFilesMap.put(pillar, 0L);
         }
         Date missingAfterDate = new Date(System.currentTimeMillis() - gracePeriod);
-        log.info("Looking for missing files, files need to be older than {} to be considered missing.",
-                missingAfterDate);
-        
-        try(IntegrityIssueIterator issueIterator = store.findFilesWithMissingCopies(reporter.getCollectionID(), 
-                pillars.size(), 0L, Long.MAX_VALUE)) {
-            
+        log.info("Looking for missing files, files need to be older than {} to be considered missing.", missingAfterDate);
+
+        try (IntegrityIssueIterator issueIterator = store.findFilesWithMissingCopies(reporter.getCollectionID(), pillars.size(), 0L,
+                Long.MAX_VALUE)) {
+
             String missingFile;
-            while((missingFile = issueIterator.getNextIntegrityIssue()) != null) {
+            while ((missingFile = issueIterator.getNextIntegrityIssue()) != null) {
                 Date earliestDate = store.getEarliestFileDate(reporter.getCollectionID(), missingFile);
-                if(earliestDate.before(missingAfterDate)) {
+                if (earliestDate.before(missingAfterDate)) {
                     try {
                         Set<String> pillarsWithFile = getPillarsWithFile(missingFile, reporter.getCollectionID());
-                        for(String pillar : pillars) {
-                            if(!pillarsWithFile.contains(pillar)) {
+                        for (String pillar : pillars) {
+                            if (!pillarsWithFile.contains(pillar)) {
                                 reporter.reportMissingFile(missingFile, pillar);
-                                missingFilesMap.put(pillar, missingFilesMap.get(pillar) + 1);         
+                                missingFilesMap.put(pillar, missingFilesMap.get(pillar) + 1);
                             }
                         }
                     } catch (IOException e) {
@@ -106,11 +101,11 @@ public synchronized void performStep() throws StepFailedException {
                 } else {
                     log.info("The file '{}' was too recent ({}) to be considered missing.", missingFile, earliestDate);
                 }
-                
-                for(String pillar : missingFilesMap.keySet()) {
+
+                for (String pillar : missingFilesMap.keySet()) {
                     sc.getPillarCollectionStat(pillar).setMissingFiles(missingFilesMap.get(pillar));
                 }
-                
+
             }
         }
     }
@@ -118,12 +113,12 @@ public synchronized void performStep() throws StepFailedException {
     private Set<String> getPillarsWithFile(String fileID, String collectionID) {
         Collection<FileInfo> fileInfos = store.getFileInfos(fileID, collectionID);
         Set<String> pillarsWithFile = new HashSet<>();
-        for(FileInfo fi : fileInfos) {
+        for (FileInfo fi : fileInfos) {
             pillarsWithFile.add(fi.getPillarId());
         }
         return pillarsWithFile;
     }
-    
+
     public static String getDescription() {
         return "Detects and reports files that are missing from one or more pillars in the collection.";
     }
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/HandleObsoleteChecksumsStep.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/HandleObsoleteChecksumsStep.java
index 215196c96..ece992875 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/HandleObsoleteChecksumsStep.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/HandleObsoleteChecksumsStep.java
@@ -5,26 +5,22 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.integrityservice.workflow.step;
 
-import java.io.IOException;
-import java.util.Date;
-import java.util.List;
-
 import org.bitrepository.common.settings.Settings;
 import org.bitrepository.common.utils.SettingsUtils;
 import org.bitrepository.common.utils.TimeUtils;
@@ -38,31 +34,30 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.util.Date;
+import java.util.List;
+
 /**
  * A workflow step for finding missing checksums.
  * Uses the IntegrityChecker to perform the actual check.
  */
 public class HandleObsoleteChecksumsStep extends AbstractWorkFlowStep {
-    /** The log.*/
-    private Logger log = LoggerFactory.getLogger(getClass());
-    /** The settings. */
+    private final Logger log = LoggerFactory.getLogger(getClass());
     private final Settings settings;
-    /** The Integrity Model. */
     private final IntegrityModel store;
-    /** The report model to populate. */
     private final IntegrityReporter reporter;
     private final StatisticsCollector sc;
-    /** A year. */
     public static final long DEFAULT_MAX_CHECKSUM_AGE = TimeUtils.MS_PER_YEAR;
-    
+
     public HandleObsoleteChecksumsStep(Settings settings, IntegrityModel store, IntegrityReporter reporter,
-            StatisticsCollector statisticsCollector) {
+                                       StatisticsCollector statisticsCollector) {
         this.settings = settings;
         this.store = store;
         this.reporter = reporter;
         this.sc = statisticsCollector;
     }
-    
+
     @Override
     public String getName() {
         return "Handle obsolete checksums reporting.";
@@ -70,30 +65,29 @@ public String getName() {
 
     /**
      * Queries the IntegrityModel for files with obsolete checksums. Reports them if any is returned.
-     * If a pillar is configured to never have it's checksums expire, it will be skipped. This is set 
-     * by having a maxChecksumAge of 0. 
+     * If a pillar is configured to never have its checksums expire, it will be skipped. This is set
+     * by having a maxChecksumAge of 0.
      */
     @Override
     public synchronized void performStep() throws StepFailedException {
         MaxChecksumAgeProvider maxChecksumAgeProvider = new MaxChecksumAgeProvider(DEFAULT_MAX_CHECKSUM_AGE,
                 settings.getReferenceSettings().getIntegrityServiceSettings().getObsoleteChecksumSettings());
-        
+
         List<String> pillars = SettingsUtils.getPillarIDsForCollection(reporter.getCollectionID());
-        
-        for(String pillar : pillars) {
+
+        for (String pillar : pillars) {
             Long obsolteteChecksums = 0L;
             long maxAge = maxChecksumAgeProvider.getMaxChecksumAge(pillar);
-            if(maxAge == 0) {
-                log.info("Skipping obsolete checksums check for pillar '" + pillar + "' as it has a "
-                        + "MaxChecksumAge of 0 (i.e. checksums don't expire).");
+            if (maxAge == 0) {
+                log.info("Skipping obsolete checksums check for pillar '" + pillar + "' as it has a " +
+                        "MaxChecksumAge of 0 (i.e. checksums don't expire).");
                 continue;
             } else {
                 Date outDated = new Date(System.currentTimeMillis() - maxAge);
-                IntegrityIssueIterator obsoleteChecksumsIterator 
-                    = store.findChecksumsOlderThan(outDated, pillar, reporter.getCollectionID());
-                String file;
-                try {
-                    while((file = obsoleteChecksumsIterator.getNextIntegrityIssue()) != null) {
+                try (IntegrityIssueIterator obsoleteChecksumsIterator = store.findChecksumsOlderThan(outDated, pillar,
+                        reporter.getCollectionID())) {
+                    String file;
+                    while ((file = obsoleteChecksumsIterator.getNextIntegrityIssue()) != null) {
                         try {
                             reporter.reportObsoleteChecksum(file, pillar);
                             obsolteteChecksums++;
@@ -101,8 +95,6 @@ public synchronized void performStep() throws StepFailedException {
                             throw new StepFailedException("Failed to report file: " + file + " as having an obsolete checksum", e);
                         }
                     }
-                } finally {
-                    obsoleteChecksumsIterator.close();
                 }
             }
             sc.getPillarCollectionStat(pillar).setObsoleteChecksums(obsolteteChecksums);
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/IncrementalUpdateChecksumsStep.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/IncrementalUpdateChecksumsStep.java
index f4922e253..05d94c83e 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/IncrementalUpdateChecksumsStep.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/IncrementalUpdateChecksumsStep.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -29,12 +29,12 @@
 import org.bitrepository.integrityservice.workflow.IntegrityContributors;
 
 /**
- * Workflow step class to handle the incremental collection of checksums.  
+ * Workflow step class to handle the incremental collection of checksums.
  */
 public class IncrementalUpdateChecksumsStep extends UpdateChecksumsStep {
-
     public IncrementalUpdateChecksumsStep(IntegrityInformationCollector collector, IntegrityModel store, IntegrityAlerter alerter,
-            ChecksumSpecTYPE checksumType, Settings settings, String collectionID, IntegrityContributors integrityContributors) {
+                                          ChecksumSpecTYPE checksumType, Settings settings, String collectionID,
+                                          IntegrityContributors integrityContributors) {
         super(collector, store, alerter, checksumType, settings, collectionID, integrityContributors);
     }
 
@@ -49,5 +49,5 @@ public String getName() {
     public static String getDescription() {
         return "Contacts all pillars to retrieve the list of new checksums for the pillar";
     }
-    
+
 }
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/IncrementalUpdateFileIDsStep.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/IncrementalUpdateFileIDsStep.java
index 7b65cb958..b87f5c18c 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/IncrementalUpdateFileIDsStep.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/IncrementalUpdateFileIDsStep.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -28,9 +28,9 @@
 import org.bitrepository.integrityservice.workflow.IntegrityContributors;
 
 public class IncrementalUpdateFileIDsStep extends UpdateFileIDsStep {
-
-    public IncrementalUpdateFileIDsStep(IntegrityInformationCollector collector, IntegrityModel store, 
-            IntegrityAlerter alerter, Settings settings, String collectionID, IntegrityContributors integrityContributors) {
+    public IncrementalUpdateFileIDsStep(IntegrityInformationCollector collector, IntegrityModel store,
+                                        IntegrityAlerter alerter, Settings settings, String collectionID,
+                                        IntegrityContributors integrityContributors) {
         super(collector, store, alerter, settings, collectionID, integrityContributors);
     }
 
@@ -45,5 +45,5 @@ public String getName() {
     public static String getDescription() {
         return "Contacts all pillar to retrieve the list of new files from the pillars";
     }
-    
+
 }
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/PutFileStep.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/PutFileStep.java
index 3d5d31ddc..3ccd655b6 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/PutFileStep.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/PutFileStep.java
@@ -5,24 +5,22 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.integrityservice.workflow.step;
 
-import java.net.URL;
-
 import org.bitrepository.bitrepositoryelements.ChecksumDataForFileTYPE;
 import org.bitrepository.client.eventhandler.OperationEvent;
 import org.bitrepository.client.eventhandler.OperationEvent.OperationEventType;
@@ -33,29 +31,24 @@
 import org.bitrepository.integrityservice.workflow.IntegrityWorkflowContext;
 import org.bitrepository.service.workflow.AbstractWorkFlowStep;
 
+import java.net.URL;
+
 /**
  * Workflow step to perform the PutFile operation.
  */
 public class PutFileStep extends AbstractWorkFlowStep {
-
-    /** The context for the integrity workflow.*/
     protected final IntegrityWorkflowContext context;
-    /** The collectionID */
     protected final String collectionId;
-    /** The id of the file to put.*/
     private final String fileId;
-    /** The URL containing the file for the PutFile operation. */
     private final URL uploadUrl;
-    /** The checksum of the file to put.*/
     private final String checksum;
 
     /**
-     * Constructor.
-     * @param context The context for the workflow.
+     * @param context      The context for the workflow.
      * @param collectionId The id of the collection to put the file to.
-     * @param fileId The id of the file to put.
-     * @param uploadUrl The URL for the file of the putfile operation.'
-     * @param checksum The checksum of the file.
+     * @param fileId       The id of the file to put.
+     * @param uploadUrl    The URL for the file of the PutFile operation.'
+     * @param checksum     The checksum of the file.
      */
     public PutFileStep(IntegrityWorkflowContext context, String collectionId, String fileId, URL uploadUrl, String checksum) {
         this.context = context;
@@ -73,19 +66,19 @@ public String getName() {
     @Override
     public void performStep() {
         IntegrityEventCompleteAwaiter eventHandler = new IntegrityEventCompleteAwaiter(context.getSettings());
-        
+
         ChecksumDataForFileTYPE checksumValidationData = new ChecksumDataForFileTYPE();
         checksumValidationData.setCalculationTimestamp(CalendarUtils.getNow());
         checksumValidationData.setChecksumSpec(ChecksumUtils.getDefault(context.getSettings()));
         checksumValidationData.setChecksumValue(Base16Utils.encodeBase16(checksum));
-        
-        context.getCollector().putFile(collectionId, fileId, uploadUrl, checksumValidationData, eventHandler, "IntegrityService: " 
-                + getName());
+
+        context.getCollector()
+                .putFile(collectionId, fileId, uploadUrl, checksumValidationData, eventHandler, "IntegrityService: " + getName());
 
         OperationEvent event = eventHandler.getFinish();
-        if(event.getEventType() == OperationEventType.FAILED) {
-            throw new IllegalStateException("Aborting workflow due to failure putting the file '" + fileId + "'. "
-                    + "Cause: " + event.toString());
+        if (event.getEventType() == OperationEventType.FAILED) {
+            throw new IllegalStateException(
+                    "Aborting workflow due to failure putting the file '" + fileId + "'. " + "Cause: " + event.toString());
         }
     }
 }
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/UpdateChecksumsStep.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/UpdateChecksumsStep.java
index 36ec8dcd8..a242e3806 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/UpdateChecksumsStep.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/UpdateChecksumsStep.java
@@ -5,28 +5,22 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.integrityservice.workflow.step;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.List;
-import java.util.Set;
-
 import org.bitrepository.access.ContributorQuery;
 import org.bitrepository.bitrepositoryelements.ChecksumSpecTYPE;
 import org.bitrepository.client.eventhandler.OperationEvent;
@@ -44,129 +38,122 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
+
 /**
  * The step for collecting the checksums of all files from all pillars.
  */
 public abstract class UpdateChecksumsStep extends AbstractWorkFlowStep {
-    /** The log.*/
-    private Logger log = LoggerFactory.getLogger(getClass());
-    
-    /** The collector for retrieving the checksums.*/
+    private final Logger log = LoggerFactory.getLogger(getClass());
     private final IntegrityInformationCollector collector;
-    /** The model where the integrity data is stored.*/
     protected final IntegrityModel store;
-    /** The checksum spec type.*/
     private final ChecksumSpecTYPE checksumType;
-    /** The integrity alerter.*/
     private final IntegrityAlerter alerter;
-    /** The timeout for waiting for the results of the GetChecksums operation.*/
     private final Long timeout;
-    /** The maximum number of results for each conversation.*/
     private final Integer maxNumberOfResultsPerConversation;
-    /** The collectionID */
     protected final String collectionID;
-    /** Continue with checks in case of failure, defaults to false */
     private boolean abortInCaseOfFailure = true;
-    /** Contributors for collecting information */
     private final IntegrityContributors integrityContributors;
-    
+
     /**
-     * Constructor.
-     * @param collector The client for collecting the checksums.
-     * @param store The storage for the integrity data.
-     * @param alerter The alerter for sending failures.
+     * @param collector    The client for collecting the checksums.
+     * @param store        The storage for the integrity data.
+     * @param alerter      The alerter for sending failures.
      * @param checksumType The type of checksum to collect.
      */
     public UpdateChecksumsStep(IntegrityInformationCollector collector, IntegrityModel store, IntegrityAlerter alerter,
-            ChecksumSpecTYPE checksumType, Settings settings, String collectionID, IntegrityContributors integrityContributors) {
+                               ChecksumSpecTYPE checksumType, Settings settings, String collectionID,
+                               IntegrityContributors integrityContributors) {
         this.collector = collector;
         this.store = store;
         this.checksumType = checksumType;
         this.alerter = alerter;
         this.collectionID = collectionID;
         this.integrityContributors = integrityContributors;
-        this.timeout = settings.getRepositorySettings().getClientSettings().getIdentificationTimeout().longValue()
-                + settings.getRepositorySettings().getClientSettings().getOperationTimeout().longValue();
+        this.timeout = settings.getRepositorySettings().getClientSettings().getIdentificationTimeout().longValue() +
+                settings.getRepositorySettings().getClientSettings().getOperationTimeout().longValue();
         this.maxNumberOfResultsPerConversation = SettingsUtils.getMaxClientPageSize();
-        if(settings.getReferenceSettings().getIntegrityServiceSettings().isSetAbortOnFailedContributor()) {
+        if (settings.getReferenceSettings().getIntegrityServiceSettings().isSetAbortOnFailedContributor()) {
             abortInCaseOfFailure = settings.getReferenceSettings().getIntegrityServiceSettings().isAbortOnFailedContributor();
         }
     }
-    
+
     /**
-     * Method to implement early/pre-performStep action  
+     * Method to implement early/pre-performStep action
      */
     protected void initialStepAction() {}
-    
+
     /**
      * Method to implement late/post-perform actions.
      */
     protected void finalStepAction() {}
-    
+
     @Override
     public synchronized void performStep() throws WorkflowAbortedException {
         try {
             initialStepAction();
 
-            Set<String> pillarsToCollectFrom =  integrityContributors.getActiveContributors();
-            log.debug("Collecting checksums from '" + pillarsToCollectFrom + "' for collection '" 
-                    + collectionID + "'.");
+            Set<String> pillarsToCollectFrom = integrityContributors.getActiveContributors();
+            log.debug("Collecting checksums from '" + pillarsToCollectFrom + "' for collection '" + collectionID + "'.");
             while (!pillarsToCollectFrom.isEmpty()) {
-                IntegrityCollectorEventHandler eventHandler = new IntegrityCollectorEventHandler(store, 
-                        timeout, integrityContributors);
+                IntegrityCollectorEventHandler eventHandler = new IntegrityCollectorEventHandler(store, timeout, integrityContributors);
                 ContributorQuery[] queries = getQueries(pillarsToCollectFrom);
-                collector.getChecksums(collectionID, pillarsToCollectFrom, checksumType, null, "IntegrityService: "
-                        + getName(), queries, eventHandler);
-                
+                collector.getChecksums(collectionID, pillarsToCollectFrom, checksumType, null, "IntegrityService: " + getName(), queries,
+                        eventHandler);
+
                 OperationEvent event = eventHandler.getFinish();
-                if(event.getEventType() == OperationEventType.FAILED) {
+                if (event.getEventType() == OperationEventType.FAILED) {
                     handleFailureEvent(event);
                 }
                 log.debug("Collecting of checksums ids had the final event: " + event);
                 pillarsToCollectFrom = integrityContributors.getActiveContributors();
             }
-            
+
             finalStepAction();
         } catch (InterruptedException e) {
             log.warn("Interrupted while collecting checksums.", e);
         }
     }
-    
+
     /**
-     * Handle a failure event. This includes checking if any contributors have failed (if not just retry), 
-     * checking to see if the workflow should be aborted, and sending alarms if needed.  
+     * Handle a failure event. This includes checking if any contributors have failed (if not just retry),
+     * checking to see if the workflow should be aborted, and sending alarms if needed.
      */
     private void handleFailureEvent(OperationEvent event) throws WorkflowAbortedException {
-        if(integrityContributors.getFailedContributors().isEmpty()) {
+        if (integrityContributors.getFailedContributors().isEmpty()) {
             log.info("Get failure event, but no contributors marked as failed, retrying");
         } else {
             OperationFailedEvent ofe = (OperationFailedEvent) event;
-            if(abortInCaseOfFailure) {
-                alerter.integrityFailed("Integrity check aborted while getting checksums due to failed contributors: " 
-                        + integrityContributors.getFailedContributors(), collectionID);
-                throw new WorkflowAbortedException("Aborting workflow due to failure collecting checksums. "
-                        + "Cause: " + ofe.toString());
+            if (abortInCaseOfFailure) {
+                alerter.integrityFailed("Integrity check aborted while getting checksums due to failed contributors: " +
+                        integrityContributors.getFailedContributors(), collectionID);
+                throw new WorkflowAbortedException("Aborting workflow due to failure collecting checksums. " + "Cause: " + ofe.toString());
             } else {
                 log.info("Failure occured collecting fileIDs, continuing collecting checksums. Failure {}", ofe.toString());
-                alerter.integrityFailed("Failure while collecting checksums, the check will continue "
-                        + "with the information available. The failed contributors were: " 
-                        + integrityContributors.getFailedContributors(), collectionID);
+                alerter.integrityFailed("Failure while collecting checksums, the check will continue " +
+                                "with the information available. The failed contributors were: " + integrityContributors.getFailedContributors(),
+                        collectionID);
             }
         }
     }
-    
+
     /**
      * Define the queries for the collection of FileIDs for the given pillars.
+     *
      * @param pillars The pillars to collect from.
      * @return The queries for the pillars for collecting the file ids.
      */
     private ContributorQuery[] getQueries(Collection<String> pillars) {
         List<ContributorQuery> res = new ArrayList<>();
-        for(String pillar : pillars) {
+        for (String pillar : pillars) {
             Date latestChecksumEntry = store.getDateForNewestChecksumEntryForPillar(pillar, collectionID);
             res.add(new ContributorQuery(pillar, latestChecksumEntry, null, maxNumberOfResultsPerConversation));
         }
-        
+
         return res.toArray(new ContributorQuery[pillars.size()]);
     }
 
diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/UpdateFileIDsStep.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/UpdateFileIDsStep.java
index 0155f69c4..d7cbc9989 100644
--- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/UpdateFileIDsStep.java
+++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/UpdateFileIDsStep.java
@@ -22,12 +22,6 @@
  */
 package org.bitrepository.integrityservice.workflow.step;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.List;
-import java.util.Set;
-
 import org.bitrepository.access.ContributorQuery;
 import org.bitrepository.client.eventhandler.OperationEvent;
 import org.bitrepository.client.eventhandler.OperationEvent.OperationEventType;
@@ -44,57 +38,52 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
+
 /**
  * The step for collecting of all file ids from all pillars.
  */
 public abstract class UpdateFileIDsStep extends AbstractWorkFlowStep {
-    /** The log.*/
-    private Logger log = LoggerFactory.getLogger(getClass());
-    
-    /** The collector for retrieving the file ids.*/
+    private final Logger log = LoggerFactory.getLogger(getClass());
     private final IntegrityInformationCollector collector;
-    /** The model where the integrity data is stored.*/
     protected final IntegrityModel store;
-    /** The integrity alerter.*/
     private final IntegrityAlerter alerter;
-    /** The timeout for waiting for the results of the GetFileIDs operation.*/
     private final Long timeout;
-    /** The maximum number of results for each conversation.*/
     private final Integer maxNumberOfResultsPerConversation;
-    /** The collectionID */
     protected final String collectionID;
-    /** Continue with checks in case of failure, defaults to false */
     private boolean abortInCaseOfFailure = true;
-    /** Contributors for collecting information */
     private final IntegrityContributors integrityContributors;
-        
+
     /**
-     * Constructor.
      * @param collector The client for collecting the checksums.
-     * @param store The storage for the integrity data.
-     * @param alerter The alerter for sending failures.
-     * @param settings The settings to use.
+     * @param store     The storage for the integrity data.
+     * @param alerter   The alerter for sending failures.
+     * @param settings  The settings to use.
      */
-    public UpdateFileIDsStep(IntegrityInformationCollector collector, IntegrityModel store, IntegrityAlerter alerter,
-            Settings settings, String collectionID, IntegrityContributors integrityContributors) {
+    public UpdateFileIDsStep(IntegrityInformationCollector collector, IntegrityModel store, IntegrityAlerter alerter, Settings settings,
+                             String collectionID, IntegrityContributors integrityContributors) {
         this.collector = collector;
         this.store = store;
         this.alerter = alerter;
         this.collectionID = collectionID;
         this.integrityContributors = integrityContributors;
-        this.timeout = settings.getRepositorySettings().getClientSettings().getIdentificationTimeout().longValue()
-                + settings.getRepositorySettings().getClientSettings().getOperationTimeout().longValue();
+        this.timeout = settings.getRepositorySettings().getClientSettings().getIdentificationTimeout().longValue() +
+                settings.getRepositorySettings().getClientSettings().getOperationTimeout().longValue();
         this.maxNumberOfResultsPerConversation = SettingsUtils.getMaxClientPageSize();
-        if(settings.getReferenceSettings().getIntegrityServiceSettings().isSetAbortOnFailedContributor()) {
+        if (settings.getReferenceSettings().getIntegrityServiceSettings().isSetAbortOnFailedContributor()) {
             abortInCaseOfFailure = settings.getReferenceSettings().getIntegrityServiceSettings().isAbortOnFailedContributor();
         }
     }
-    
+
     /**
-     * Method to implement early/pre-performStep action  
+     * Method to implement early/pre-performStep action
      */
     protected void initialStepAction() {}
-    
+
     @Override
     public synchronized void performStep() throws WorkflowAbortedException {
         initialStepAction();
@@ -103,16 +92,14 @@ public synchronized void performStep() throws WorkflowAbortedException {
             Set<String> pillarsToCollectFrom = integrityContributors.getActiveContributors();
             log.debug("Collecting fileIDs from: " + pillarsToCollectFrom);
             while (!pillarsToCollectFrom.isEmpty()) {
-                IntegrityCollectorEventHandler eventHandler 
-                    = new IntegrityCollectorEventHandler(store, timeout, integrityContributors);
+                IntegrityCollectorEventHandler eventHandler = new IntegrityCollectorEventHandler(store, timeout, integrityContributors);
                 ContributorQuery[] queries = getQueries(pillarsToCollectFrom);
-                collector.getFileIDs(collectionID, pillarsToCollectFrom,
-                        "IntegrityService: " + getName(), queries, eventHandler);
-                
+                collector.getFileIDs(collectionID, pillarsToCollectFrom, "IntegrityService: " + getName(), queries, eventHandler);
+
                 OperationEvent event = eventHandler.getFinish();
-                if(event.getEventType() == OperationEventType.FAILED) {
+                if (event.getEventType() == OperationEventType.FAILED) {
                     handleFailureEvent(event);
-                 }
+                }
                 log.debug("Collection of file ids had the final event: " + event);
                 pillarsToCollectFrom = integrityContributors.getActiveContributors();
             }
@@ -120,42 +107,42 @@ public synchronized void performStep() throws WorkflowAbortedException {
             log.warn("Interrupted while collecting file ids.", e);
         }
     }
-    
+
     /**
-     * Handle a failure event. This includes checking if any contributors have failed (if not just retry), 
-     * checking to see if the workflow should be aborted, and sending alarms if needed.  
+     * Handle a failure event. This includes checking if any contributors have failed (if not just retry),
+     * checking to see if the workflow should be aborted, and sending alarms if needed.
      */
     private void handleFailureEvent(OperationEvent event) throws WorkflowAbortedException {
-        if(integrityContributors.getFailedContributors().isEmpty()) {
+        if (integrityContributors.getFailedContributors().isEmpty()) {
             log.info("Get failure event, but no contributors marked as failed, retrying");
         } else {
             OperationFailedEvent ofe = (OperationFailedEvent) event;
-            if(abortInCaseOfFailure) {
-                alerter.integrityFailed("Integrity check aborted while getting fileIDs due to failed contributors: " 
-                        + integrityContributors.getFailedContributors(), collectionID);
-                throw new WorkflowAbortedException("Aborting workflow due to failure collecting fileIDs. "
-                        + "Cause: " + ofe.toString());
+            if (abortInCaseOfFailure) {
+                alerter.integrityFailed("Integrity check aborted while getting fileIDs due to failed contributors: " +
+                        integrityContributors.getFailedContributors(), collectionID);
+                throw new WorkflowAbortedException("Aborting workflow due to failure collecting fileIDs. " + "Cause: " + ofe.toString());
             } else {
-                log.info("Failure occured collecting fileIDs, continuing collecting fileIDs. Failure {}", ofe.toString());
-                alerter.integrityFailed("Failure while collecting fileIDs, the check will continue "
-                        + "with the information available. The failed contributors were: " 
-                        + integrityContributors.getFailedContributors(), collectionID);
+                log.info("Failure occurred collecting fileIDs, continuing collecting fileIDs. Failure {}", ofe.toString());
+                alerter.integrityFailed("Failure while collecting fileIDs, the check will continue " +
+                                "with the information available. The failed contributors were: " + integrityContributors.getFailedContributors(),
+                        collectionID);
             }
         }
     }
-    
+
     /**
      * Define the queries for the collection of FileIDs for the given pillars.
+     *
      * @param pillars The pillars to collect from.
      * @return The queries for the pillars for collecting the file ids.
      */
     private ContributorQuery[] getQueries(Collection<String> pillars) {
         List<ContributorQuery> res = new ArrayList<>();
-        for(String pillar : pillars) {
+        for (String pillar : pillars) {
             Date latestFileIDEntry = store.getDateForNewestFileEntryForPillar(pillar, collectionID);
             res.add(new ContributorQuery(pillar, latestFileIDEntry, null, maxNumberOfResultsPerConversation));
         }
-        
+
         return res.toArray(new ContributorQuery[pillars.size()]);
     }
 }
diff --git a/bitrepository-integrity-service/src/main/webapp/WEB-INF/web.xml b/bitrepository-integrity-service/src/main/webapp/WEB-INF/web.xml
index 03c15bcc8..4a1a630bf 100644
--- a/bitrepository-integrity-service/src/main/webapp/WEB-INF/web.xml
+++ b/bitrepository-integrity-service/src/main/webapp/WEB-INF/web.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   #%L
-  Bitrepository Integrity Client
+  BitRepository Integrity Client
   
   $Id$
   $HeadURL$
@@ -24,7 +24,7 @@
   #L%
   -->
 <web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
   <display-name>Bitrepository integrityservice</display-name>
   <servlet>
     <servlet-name>Bitrepository-integrityservice</servlet-name>
@@ -33,7 +33,7 @@
       <param-name>javax.ws.rs.Application</param-name>
       <param-value>org.bitrepository.integrityservice.web.IntegrityServiceRestApplication</param-value>
     </init-param>
-    <load-on-startup>1</load-on-startup> 
+    <load-on-startup>1</load-on-startup>
   </servlet>
   <servlet-mapping>
     <servlet-name>Bitrepository-integrityservice</servlet-name>
diff --git a/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/IntegrityDatabaseTestCase.java b/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/IntegrityDatabaseTestCase.java
index 67e42179c..46b19fd0f 100644
--- a/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/IntegrityDatabaseTestCase.java
+++ b/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/IntegrityDatabaseTestCase.java
@@ -21,9 +21,6 @@
  */
 package org.bitrepository.integrityservice;
 
-import java.math.BigInteger;
-import java.util.List;
-
 import org.bitrepository.bitrepositoryelements.ChecksumDataForChecksumSpecTYPE;
 import org.bitrepository.bitrepositoryelements.FileIDsData;
 import org.bitrepository.bitrepositoryelements.FileIDsData.FileIDsDataItems;
@@ -40,6 +37,9 @@
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 
+import java.math.BigInteger;
+import java.util.List;
+
 public abstract class IntegrityDatabaseTestCase extends ExtendedTestCase {
     protected Settings settings;
     
diff --git a/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/IntegrityWorkflowSchedulerTest.java b/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/IntegrityWorkflowSchedulerTest.java
index 13cd435bc..743a48350 100644
--- a/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/IntegrityWorkflowSchedulerTest.java
+++ b/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/IntegrityWorkflowSchedulerTest.java
@@ -24,7 +24,7 @@
 //import org.bitrepository.common.settings.Settings;
 //import org.bitrepository.common.settings.TestSettingsProvider;
 //import org.bitrepository.integrityservice.mocks.MockWorkflow;
-//import org.bitrepository.integrityservice.scheduler.TimerbasedScheduler;
+//import org.bitrepository.integrityservice.scheduler.TimerBasedScheduler;
 //import org.bitrepository.integrityservice.scheduler.workflow.Workflow;
 //import org.jaccept.structure.ExtendedTestCase;
 //import org.testng.Assert;
@@ -48,7 +48,7 @@
 //    public void testSchedulerContainingWorkflows() {
 //        addDescription("Test that schedulers call all workflow at the given intervals.");
 //        addStep("Setup a scheduler and validate initial state", "No errors and no workflows");
-//        TimerbasedScheduler scheduler = new TimerbasedScheduler(settings);
+//        TimerBasedScheduler scheduler = new TimerBasedScheduler(settings);
 //        Assert.assertEquals(scheduler.getJobs().size(), 0, "Should not be any workflows in the scheduler.");
 //        
 //        addStep("Make a new workflow, add it to the scheduler and extract it afterwards.", 
@@ -76,7 +76,7 @@
 //        addStep("Setup the variables and such.", "Should not be able to fail here.");
 //        String taskName = "MockWorkFlow";
 //        settings.getReferenceSettings().getIntegrityServiceSettings().setSchedulerInterval(INTERVAL);
-//        TimerbasedScheduler scheduler = new TimerbasedScheduler(settings);
+//        TimerBasedScheduler scheduler = new TimerBasedScheduler(settings);
 //        
 //        addStep("Create a workflow", "Should not have been called yet been called.");
 //        MockWorkflow workflow = new MockWorkflow(INTERVAL + INTERVAL_DELAY, taskName);
diff --git a/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/cache/FileInfoTest.java b/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/cache/FileInfoTest.java
index c2809a8f1..0d9530b3e 100644
--- a/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/cache/FileInfoTest.java
+++ b/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/cache/FileInfoTest.java
@@ -21,14 +21,14 @@
  */
 package org.bitrepository.integrityservice.cache;
 
-import javax.xml.datatype.DatatypeConstants;
-import javax.xml.datatype.XMLGregorianCalendar;
-
 import org.bitrepository.common.utils.CalendarUtils;
 import org.jaccept.structure.ExtendedTestCase;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
+import javax.xml.datatype.DatatypeConstants;
+import javax.xml.datatype.XMLGregorianCalendar;
+
 public class FileInfoTest extends ExtendedTestCase {
     
     private static final String FILE_ID = "TEST-FILE"; 
diff --git a/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/cache/IntegrityDAOTest.java b/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/cache/IntegrityDAOTest.java
index 2f47f3380..77d783d7f 100644
--- a/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/cache/IntegrityDAOTest.java
+++ b/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/cache/IntegrityDAOTest.java
@@ -24,18 +24,6 @@
  */
 package org.bitrepository.integrityservice.cache;
 
-import java.math.BigInteger;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
 import org.bitrepository.bitrepositoryelements.ChecksumDataForChecksumSpecTYPE;
 import org.bitrepository.bitrepositoryelements.FileIDsData;
 import org.bitrepository.bitrepositoryelements.FileIDsData.FileIDsDataItems;
@@ -51,6 +39,18 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import java.math.BigInteger;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
 public class IntegrityDAOTest extends IntegrityDatabaseTestCase {
     String TEST_PILLAR_1 = "MY-TEST-PILLAR-1";
     String TEST_PILLAR_2 = "MY-TEST-PILLAR-2";
diff --git a/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/cache/IntegrityDBToolsTest.java b/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/cache/IntegrityDBToolsTest.java
index bbccc4bcf..371cef215 100644
--- a/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/cache/IntegrityDBToolsTest.java
+++ b/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/cache/IntegrityDBToolsTest.java
@@ -21,14 +21,6 @@
  */
 package org.bitrepository.integrityservice.cache;
 
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
-
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.List;
-
 import org.bitrepository.bitrepositoryelements.ChecksumDataForChecksumSpecTYPE;
 import org.bitrepository.bitrepositoryelements.FileIDsData;
 import org.bitrepository.bitrepositoryelements.FileIDsData.FileIDsDataItems;
@@ -45,6 +37,14 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
+
 public class IntegrityDBToolsTest extends IntegrityDatabaseTestCase {
 
     String TEST_PILLAR_1 = "MY-TEST-PILLAR-1";
diff --git a/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/cache/IntegrityDatabaseTest.java b/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/cache/IntegrityDatabaseTest.java
index c04fc3b58..eb2b0c896 100644
--- a/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/cache/IntegrityDatabaseTest.java
+++ b/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/cache/IntegrityDatabaseTest.java
@@ -24,15 +24,6 @@
  */
 package org.bitrepository.integrityservice.cache;
 
-import static org.mockito.Mockito.mock;
-
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
 import org.bitrepository.bitrepositoryelements.ChecksumDataForChecksumSpecTYPE;
 import org.bitrepository.bitrepositoryelements.FileIDsData;
 import org.bitrepository.bitrepositoryelements.FileIDsData.FileIDsDataItems;
@@ -47,6 +38,15 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import static org.mockito.Mockito.mock;
+
 public class IntegrityDatabaseTest extends IntegrityDatabaseTestCase {
     AuditTrailManager auditManager;
     String TEST_PILLAR_1 = "MY-TEST-PILLAR-1";
diff --git a/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/checking/MaxChecksumAgeProviderTest.java b/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/checking/MaxChecksumAgeProviderTest.java
index 4b2e8d0d9..91b5ac4a1 100644
--- a/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/checking/MaxChecksumAgeProviderTest.java
+++ b/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/checking/MaxChecksumAgeProviderTest.java
@@ -21,12 +21,12 @@
  */
 package org.bitrepository.integrityservice.checking;
 
-import java.math.BigInteger;
-
 import org.bitrepository.settings.referencesettings.ObsoleteChecksumSettings;
 import org.jaccept.structure.ExtendedTestCase;
 import org.testng.annotations.Test;
 
+import java.math.BigInteger;
+
 import static org.testng.Assert.assertEquals;
 
 public class MaxChecksumAgeProviderTest extends ExtendedTestCase{
diff --git a/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/reports/BasicIntegrityReporterTest.java b/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/reports/BasicIntegrityReporterTest.java
index 58a0387cb..c39fb3183 100644
--- a/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/reports/BasicIntegrityReporterTest.java
+++ b/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/reports/BasicIntegrityReporterTest.java
@@ -22,11 +22,11 @@
 
 package org.bitrepository.integrityservice.reports;
 
-import java.io.File;
-
 import org.jaccept.structure.ExtendedTestCase;
 import org.testng.annotations.Test;
 
+import java.io.File;
+
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertFalse;
 import static org.testng.AssertJUnit.assertTrue;
diff --git a/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/reports/ExampleReportGenerationTest.java b/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/reports/ExampleReportGenerationTest.java
index 52f85fb6d..4d69a810b 100644
--- a/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/reports/ExampleReportGenerationTest.java
+++ b/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/reports/ExampleReportGenerationTest.java
@@ -21,6 +21,9 @@
  */
 package org.bitrepository.integrityservice.reports;
 
+import org.jaccept.structure.ExtendedTestCase;
+import org.testng.annotations.Test;
+
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
@@ -28,9 +31,6 @@
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
 
-import org.jaccept.structure.ExtendedTestCase;
-import org.testng.annotations.Test;
-
 
 public class ExampleReportGenerationTest extends ExtendedTestCase {
 
diff --git a/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/stresstest/DatabaseStressTests.java b/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/stresstest/DatabaseStressTests.java
index 9f1473ff2..081175372 100644
--- a/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/stresstest/DatabaseStressTests.java
+++ b/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/stresstest/DatabaseStressTests.java
@@ -21,11 +21,6 @@
  */
 package org.bitrepository.integrityservice.stresstest;
 
-import java.math.BigInteger;
-import java.util.Date;
-
-import javax.xml.datatype.XMLGregorianCalendar;
-
 import org.bitrepository.bitrepositoryelements.FileIDsData;
 import org.bitrepository.bitrepositoryelements.FileIDsData.FileIDsDataItems;
 import org.bitrepository.bitrepositoryelements.FileIDsDataItem;
@@ -47,6 +42,10 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import javax.xml.datatype.XMLGregorianCalendar;
+import java.math.BigInteger;
+import java.util.Date;
+
 public class DatabaseStressTests extends ExtendedTestCase {
     
     private static final String PILLAR_1 = "pillar1";
diff --git a/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/workflow/IntegrityContributorsTest.java b/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/workflow/IntegrityContributorsTest.java
index 10b49e263..cd9853a7a 100644
--- a/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/workflow/IntegrityContributorsTest.java
+++ b/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/workflow/IntegrityContributorsTest.java
@@ -21,14 +21,12 @@
  */
 package org.bitrepository.integrityservice.workflow;
 
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
 import java.util.Arrays;
 import java.util.Set;
 
-import javax.validation.constraints.AssertTrue;
-
-import org.testng.annotations.Test;
-import org.testng.Assert;
-
 
 public class IntegrityContributorsTest {
 
diff --git a/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/workflow/IntegrityWorkflowManagerTest.java b/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/workflow/IntegrityWorkflowManagerTest.java
index 6285c4141..e1e8abe2f 100644
--- a/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/workflow/IntegrityWorkflowManagerTest.java
+++ b/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/workflow/IntegrityWorkflowManagerTest.java
@@ -25,7 +25,7 @@
 import org.bitrepository.common.settings.Settings;
 import org.bitrepository.common.settings.TestSettingsProvider;
 import org.bitrepository.common.utils.SettingsUtils;
-import org.bitrepository.service.scheduler.TimerbasedScheduler;
+import org.bitrepository.service.scheduler.TimerBasedScheduler;
 import org.bitrepository.service.workflow.WorkflowManager;
 import org.bitrepository.settings.referencesettings.Collections;
 import org.bitrepository.settings.referencesettings.Schedule;
@@ -48,14 +48,14 @@
 public class IntegrityWorkflowManagerTest extends ExtendedTestCase {
     private Settings settings;
     private WorkflowSettings workflowSettings;
-    private TimerbasedScheduler scheduler;
+    private TimerBasedScheduler scheduler;
     private String collection1ID, collection2ID;
     private TestWorkflow workflow1, workflow2;
 
 
     @BeforeMethod(alwaysRun = true)
     public void setup() {
-        scheduler = mock(TimerbasedScheduler.class);
+        scheduler = mock(TimerBasedScheduler.class);
         settings = TestSettingsProvider.reloadSettings(this.getClass().getSimpleName());
         workflowSettings = new WorkflowSettings();
         WorkflowConfiguration workflowConfiguration = new WorkflowConfiguration();
diff --git a/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/workflow/RepairMissingFilesWorkflowTest.java b/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/workflow/RepairMissingFilesWorkflowTest.java
index f5d2cd176..07ba6c040 100644
--- a/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/workflow/RepairMissingFilesWorkflowTest.java
+++ b/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/workflow/RepairMissingFilesWorkflowTest.java
@@ -21,25 +21,6 @@
  */
 package org.bitrepository.integrityservice.workflow;
 
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.when;
-
-import java.math.BigInteger;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-
 import org.bitrepository.bitrepositoryelements.ChecksumDataForFileTYPE;
 import org.bitrepository.client.eventhandler.CompleteEvent;
 import org.bitrepository.client.eventhandler.EventHandler;
@@ -61,6 +42,25 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import java.math.BigInteger;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
 public class RepairMissingFilesWorkflowTest extends ExtendedTestCase {
     
     private static final String PILLAR_1 = "pillar1";
diff --git a/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/workflow/SaltedChecksumWorkflowTest.java b/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/workflow/SaltedChecksumWorkflowTest.java
index 41906c8dc..3d1b85b57 100644
--- a/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/workflow/SaltedChecksumWorkflowTest.java
+++ b/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/workflow/SaltedChecksumWorkflowTest.java
@@ -21,19 +21,6 @@
  */
 package org.bitrepository.integrityservice.workflow;
 
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.verifyNoInteractions;
-import static org.mockito.Mockito.when;
-import static org.mockito.Mockito.times;
-
-import java.util.Arrays;
-
 import org.bitrepository.access.getchecksums.conversation.ChecksumsCompletePillarEvent;
 import org.bitrepository.bitrepositoryelements.ChecksumDataForChecksumSpecTYPE;
 import org.bitrepository.bitrepositoryelements.ChecksumSpecTYPE;
@@ -60,6 +47,19 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import java.util.Arrays;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
 public class SaltedChecksumWorkflowTest extends ExtendedTestCase {
     
     private static final String PILLAR_1 = "pillar1";
diff --git a/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/workflow/step/HandleChecksumValidationStepTest.java b/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/workflow/step/HandleChecksumValidationStepTest.java
index 1078f4a8d..83891a277 100644
--- a/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/workflow/step/HandleChecksumValidationStepTest.java
+++ b/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/workflow/step/HandleChecksumValidationStepTest.java
@@ -21,14 +21,6 @@
  */
 package org.bitrepository.integrityservice.workflow.step;
 
-import static org.mockito.Mockito.mock;
-
-import java.io.File;
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
 import org.bitrepository.bitrepositoryelements.ChecksumDataForChecksumSpecTYPE;
 import org.bitrepository.bitrepositoryelements.FileAction;
 import org.bitrepository.bitrepositoryelements.FileIDsData;
@@ -49,6 +41,14 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
+import java.io.File;
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import static org.mockito.Mockito.mock;
+
 /**
  * Performs the validation of the integrity for the checksums.
  */
diff --git a/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/workflow/step/PutFileStepTest.java b/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/workflow/step/PutFileStepTest.java
index aa05f187e..682846310 100644
--- a/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/workflow/step/PutFileStepTest.java
+++ b/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/workflow/step/PutFileStepTest.java
@@ -21,25 +21,24 @@
  */
 package org.bitrepository.integrityservice.workflow.step;
 
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-
-import java.net.URL;
-
 import org.bitrepository.bitrepositoryelements.ChecksumDataForFileTYPE;
 import org.bitrepository.client.eventhandler.CompleteEvent;
 import org.bitrepository.client.eventhandler.EventHandler;
 import org.bitrepository.client.eventhandler.OperationFailedEvent;
 import org.bitrepository.integrityservice.workflow.IntegrityWorkflowContext;
-import org.bitrepository.service.exception.WorkflowAbortedException;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 import org.testng.annotations.Test;
 
+import java.net.URL;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+
 @SuppressWarnings("rawtypes")
 public class PutFileStepTest extends WorkflowstepTest {
     public static final String TEST_PILLAR_1 = "test-pillar-1";
diff --git a/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/workflow/step/UpdateChecksumsStepTest.java b/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/workflow/step/UpdateChecksumsStepTest.java
index 3d7f8bc5f..8e4207f23 100644
--- a/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/workflow/step/UpdateChecksumsStepTest.java
+++ b/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/workflow/step/UpdateChecksumsStepTest.java
@@ -21,22 +21,6 @@
  */
 package org.bitrepository.integrityservice.workflow.step;
 
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.when;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-
 import org.bitrepository.access.ContributorQuery;
 import org.bitrepository.access.getchecksums.conversation.ChecksumsCompletePillarEvent;
 import org.bitrepository.bitrepositoryelements.ChecksumDataForChecksumSpecTYPE;
@@ -54,12 +38,26 @@
 import org.bitrepository.common.utils.SettingsUtils;
 import org.bitrepository.integrityservice.cache.IntegrityModel;
 import org.bitrepository.service.exception.WorkflowAbortedException;
-import org.mockito.ArgumentMatchers;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
 @SuppressWarnings("rawtypes")
 public class UpdateChecksumsStepTest extends WorkflowstepTest {
     public static final String TEST_PILLAR_1 = "test-pillar-1";
diff --git a/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/workflow/step/UpdateFileIDsStepTest.java b/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/workflow/step/UpdateFileIDsStepTest.java
index 142c0b92e..bc019e992 100644
--- a/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/workflow/step/UpdateFileIDsStepTest.java
+++ b/bitrepository-integrity-service/src/test/java/org/bitrepository/integrityservice/workflow/step/UpdateFileIDsStepTest.java
@@ -21,20 +21,6 @@
  */
 package org.bitrepository.integrityservice.workflow.step;
 
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.when;
-
-import java.math.BigInteger;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashSet;
-
 import org.bitrepository.access.ContributorQuery;
 import org.bitrepository.access.getfileids.conversation.FileIDsCompletePillarEvent;
 import org.bitrepository.bitrepositoryelements.FileIDsData;
@@ -49,12 +35,24 @@
 import org.bitrepository.client.eventhandler.OperationFailedEvent;
 import org.bitrepository.common.utils.CalendarUtils;
 import org.bitrepository.service.exception.WorkflowAbortedException;
-import org.mockito.ArgumentMatchers;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
+import java.math.BigInteger;
+import java.util.Arrays;
+import java.util.HashSet;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
 @SuppressWarnings("rawtypes")
 public class UpdateFileIDsStepTest extends WorkflowstepTest {
     public static final String TEST_PILLAR_1 = "test-pillar-1";
diff --git a/bitrepository-monitoring-service/src/main/java/org/bitrepository/monitoringservice/MonitoringService.java b/bitrepository-monitoring-service/src/main/java/org/bitrepository/monitoringservice/MonitoringService.java
index 10f5cc2f6..626b3583b 100644
--- a/bitrepository-monitoring-service/src/main/java/org/bitrepository/monitoringservice/MonitoringService.java
+++ b/bitrepository-monitoring-service/src/main/java/org/bitrepository/monitoringservice/MonitoringService.java
@@ -5,25 +5,22 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.monitoringservice;
 
-import java.util.Map;
-import javax.jms.JMSException;
-
 import org.bitrepository.access.AccessComponentFactory;
 import org.bitrepository.access.getstatus.GetStatusClient;
 import org.bitrepository.common.settings.Settings;
@@ -42,68 +39,56 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/**
- * The monitoring service.
- */
+import javax.jms.JMSException;
+import java.util.Map;
+
 public class MonitoringService implements LifeCycledService {
     private final Logger log = LoggerFactory.getLogger(getClass());
-    /** The settings. */
     private final Settings settings;
-    /** The store of collected statuses */
     private final StatusStore statusStore;
-    /** The client for getting statuses. */
-    private final GetStatusClient getStatusClient;
-    /** The alerter for sending alarms */
-    private final MonitorAlerter alerter;
-    /** The status collector */
     private final StatusCollector collector;
-    
-    /**
-     * Constructor.
-     * @param settings The settings.
-     * @param securityManager The security manager.
-     */
+
     public MonitoringService(Settings settings, SecurityManager securityManager) {
         this.settings = settings;
         SettingsUtils.initialize(settings);
         MessageBus messageBus = MessageBusManager.getMessageBus(settings, securityManager);
         statusStore = new ComponentStatusStore(SettingsUtils.getStatusContributorsForCollection());
-        alerter = new BasicMonitoringServiceAlerter(settings, messageBus, AlarmLevel.ERROR, statusStore);
-        getStatusClient = AccessComponentFactory.getInstance().createGetStatusClient(settings, securityManager,
+        MonitorAlerter alerter = new BasicMonitoringServiceAlerter(settings, messageBus, AlarmLevel.ERROR, statusStore);
+        GetStatusClient getStatusClient = AccessComponentFactory.getInstance().createGetStatusClient(settings, securityManager,
                 settings.getReferenceSettings().getMonitoringServiceSettings().getID());
         collector = new StatusCollector(getStatusClient, settings, statusStore, alerter);
         collector.start();
     }
-    
+
     /**
      * @return The map of the status for the components.
      */
     public Map<String, ComponentStatus> getStatus() {
         return statusStore.getStatusMap();
     }
-    
+
     @Override
     public void start() {}
-    
+
     /**
      * @return The maximum number of attempts to retrieve a status from a component before dispatching an alarm.
      */
     public int getMaxRetries() {
         return settings.getReferenceSettings().getMonitoringServiceSettings().getMaxRetries().intValue();
-    } 
-    
+    }
+
     /**
      * @return The interval between collecting status from the components.
      */
     public long getCollectionInterval() {
         return settings.getReferenceSettings().getMonitoringServiceSettings().getCollectionInterval();
     }
-    
+
     @Override
     public void shutdown() {
         collector.stop();
         MessageBus messageBus = MessageBusManager.getMessageBus();
-        if ( messageBus != null) {
+        if (messageBus != null) {
             try {
                 messageBus.close();
             } catch (JMSException e) {
diff --git a/bitrepository-monitoring-service/src/main/java/org/bitrepository/monitoringservice/MonitoringServiceFactory.java b/bitrepository-monitoring-service/src/main/java/org/bitrepository/monitoringservice/MonitoringServiceFactory.java
index 10d4548b7..50030f19e 100644
--- a/bitrepository-monitoring-service/src/main/java/org/bitrepository/monitoringservice/MonitoringServiceFactory.java
+++ b/bitrepository-monitoring-service/src/main/java/org/bitrepository/monitoringservice/MonitoringServiceFactory.java
@@ -5,30 +5,22 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.monitoringservice;
 
-import java.io.BufferedReader;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Paths;
-import java.util.Properties;
-
 import org.bitrepository.common.settings.Settings;
 import org.bitrepository.common.settings.XMLFileSettingsLoader;
 import org.bitrepository.protocol.security.BasicSecurityManager;
@@ -37,47 +29,50 @@
 import org.bitrepository.service.ServiceSettingsProvider;
 import org.bitrepository.settings.referencesettings.ServiceType;
 
+import java.io.BufferedReader;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Paths;
+import java.util.Properties;
+
 /**
  * The factory for the monitoring service.
  */
 public class MonitoringServiceFactory {
-    /** The configuration directory containing the settings, et.al.*/
     private static String confDir;
-    /** The private key file containing the security information.*/
     private static String privateKeyFile;
-    /** The properties file holding implementation specifics for the alarm service. */
-    private static final String CONFIGFILE = "monitoring.properties";
-    /** Property key to tell where to locate the path and filename to the private key file. */
+    private static final String CONFIG_FILE = "monitoring.properties";
+    /**
+     * Property key to tell where to locate the path and filename to the private key file.
+     */
     private static final String PRIVATE_KEY_FILE = "org.bitrepository.monitoring-service.privateKeyFile";
-    /** The settings. */
     private static Settings settings;
-    /** The security manager.*/
     private static SecurityManager securityManager;
-    /** The implementation of the integrity service.*/
     private static MonitoringService monitoringService;
 
+    private MonitoringServiceFactory() {}
+
     /**
-     * Private constructor, use static getINSTANCE method to get instance.
-     */
-    private MonitoringServiceFactory() { }
-    
-    /**
-     * Set the configuration directory. 
+     * Set the configuration directory.
      * Should only be run at initialization time.
-     * @param configurationDir FIXME
+     *
+     * @param configurationDir The path to the configurations as {@link String} representation.
      */
     public synchronized static void init(String configurationDir) {
         confDir = configurationDir;
     }
-    
+
     /**
      * Retrieves the settings from the defined location.
+     *
      * @return The settings.
      * @see Settings
      */
     public synchronized static Settings getSettings() {
-        if(settings == null) {
-            if(confDir == null) {
+        if (settings == null) {
+            if (confDir == null) {
                 throw new IllegalStateException("No configuration directory has been set!");
             }
             loadProperties();
@@ -89,49 +84,50 @@ public synchronized static Settings getSettings() {
 
         return settings;
     }
-    
+
     /**
      * Instantiated the security manager for the integrity service.
+     *
      * @return The security manager.
      * @see #getSettings()
      * @see BasicSecurityManager
      */
     public synchronized static SecurityManager getSecurityManager() {
-        if(securityManager == null) {
+        if (securityManager == null) {
             getSettings();
             securityManager = SecurityManagerUtil.getSecurityManager(settings, Paths.get(privateKeyFile),
                     settings.getReferenceSettings().getMonitoringServiceSettings().getID());
         }
-        
+
         return securityManager;
     }
-    
+
     /**
-     * Factory method to get a singleton instance of the SimpleIntegrityService. 
+     * Factory method to get a singleton instance of the SimpleIntegrityService.
      * Uses the settings and the security manager.
+     *
      * @return The SimpleIntegrityService
      * @see #getSecurityManager()
      * @see #getSettings()
      * @see MonitoringService
      */
     public synchronized static MonitoringService getMonitoringService() {
-        if(monitoringService == null) {
+        if (monitoringService == null) {
             getSettings();
             getSecurityManager();
             monitoringService = new MonitoringService(settings, securityManager);
         }
-        
+
         return monitoringService;
     }
-    
-    
+
     /**
-     * Loads the properties.
+     * Loads the properties from the configuration directory, that is set using the {@link #init(String)} method.
      */
     private static void loadProperties() {
         try {
             Properties properties = new Properties();
-            String propertiesFile = confDir + "/" + CONFIGFILE;
+            String propertiesFile = confDir + "/" + CONFIG_FILE;
             BufferedReader propertiesReader = new BufferedReader(
                     new InputStreamReader(new FileInputStream(propertiesFile), StandardCharsets.UTF_8));
             properties.load(propertiesReader);
diff --git a/bitrepository-monitoring-service/src/main/java/org/bitrepository/monitoringservice/alarm/BasicMonitoringServiceAlerter.java b/bitrepository-monitoring-service/src/main/java/org/bitrepository/monitoringservice/alarm/BasicMonitoringServiceAlerter.java
index 9a184e5a5..68979bc4a 100644
--- a/bitrepository-monitoring-service/src/main/java/org/bitrepository/monitoringservice/alarm/BasicMonitoringServiceAlerter.java
+++ b/bitrepository-monitoring-service/src/main/java/org/bitrepository/monitoringservice/alarm/BasicMonitoringServiceAlerter.java
@@ -5,26 +5,22 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.monitoringservice.alarm;
 
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
 import org.bitrepository.bitrepositoryelements.Alarm;
 import org.bitrepository.bitrepositoryelements.AlarmCode;
 import org.bitrepository.common.settings.Settings;
@@ -34,45 +30,47 @@
 import org.bitrepository.service.AlarmDispatcher;
 import org.bitrepository.settings.referencesettings.AlarmLevel;
 
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
 /**
  * Class for the monitoring service keep a watch on non responding components, and send alarms if needed.
  */
 public class BasicMonitoringServiceAlerter extends AlarmDispatcher implements MonitorAlerter {
-    /** The store for the status results from the components.*/
     private final StatusStore statusStore;
-    /** The maximum number of missing replies before an alarm is dispatched.*/
     private final BigInteger maxRetries;
 
     /**
-     * @param settings    FIXME
-     * @param statusStore The store for the status results from the components.
+     * @param settings    The settings.
      * @param sender      Used for sending the alarms.
      * @param alarmLevel  Only send alarms at this alarms level or higher.
-     * @param statusStore Used to maintain the status of the components.
+     * @param statusStore The store for the status results from the components.
      */
     public BasicMonitoringServiceAlerter(
-        Settings settings, MessageSender sender, AlarmLevel alarmLevel, StatusStore statusStore) {
+            Settings settings, MessageSender sender, AlarmLevel alarmLevel, StatusStore statusStore) {
         super(settings, sender, alarmLevel);
         this.statusStore = statusStore;
         maxRetries = settings.getReferenceSettings().getMonitoringServiceSettings().getMaxRetries();
     }
-    
+
     @Override
     public void checkStatuses() {
         Map<String, ComponentStatus> statusMap = statusStore.getStatusMap();
         List<String> nonRespondingComponents = new ArrayList<>();
-        for(String ID : statusMap.keySet()) {
+        for (String ID : statusMap.keySet()) {
             ComponentStatus componentStatus = statusMap.get(ID);
-            if(componentStatus.getNumberOfMissingReplies() >= maxRetries.intValue()) {
+            if (componentStatus.getNumberOfMissingReplies() >= maxRetries.intValue()) {
                 componentStatus.markAsUnresponsive();
-                if(!componentStatus.hasAlarmed()) {
-                	nonRespondingComponents.add(ID);
-                	componentStatus.alarmed();
+                if (!componentStatus.hasAlarmed()) {
+                    nonRespondingComponents.add(ID);
+                    componentStatus.alarmed();
                 }
             }
         }
-        
-        if(!nonRespondingComponents.isEmpty()) {
+
+        if (!nonRespondingComponents.isEmpty()) {
             Alarm alarm = new Alarm();
             alarm.setAlarmCode(AlarmCode.COMPONENT_FAILURE);
             alarm.setAlarmText("The following components have become " +
diff --git a/bitrepository-monitoring-service/src/main/java/org/bitrepository/monitoringservice/alarm/MonitorAlerter.java b/bitrepository-monitoring-service/src/main/java/org/bitrepository/monitoringservice/alarm/MonitorAlerter.java
index 9bc82ca7b..d2d2a1bfe 100644
--- a/bitrepository-monitoring-service/src/main/java/org/bitrepository/monitoringservice/alarm/MonitorAlerter.java
+++ b/bitrepository-monitoring-service/src/main/java/org/bitrepository/monitoringservice/alarm/MonitorAlerter.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -25,10 +25,10 @@
  * Interface for the monitor alerter.
  */
 public interface MonitorAlerter {
-    
+
     /**
      * Check for components that have not responded withing the given constraints, and send alarm
-     * message if there is any. 
+     * message if there is any.
      */
     void checkStatuses();
 }
diff --git a/bitrepository-monitoring-service/src/main/java/org/bitrepository/monitoringservice/collector/GetStatusEventHandler.java b/bitrepository-monitoring-service/src/main/java/org/bitrepository/monitoringservice/collector/GetStatusEventHandler.java
index 6454246c4..44f1f9b72 100644
--- a/bitrepository-monitoring-service/src/main/java/org/bitrepository/monitoringservice/collector/GetStatusEventHandler.java
+++ b/bitrepository-monitoring-service/src/main/java/org/bitrepository/monitoringservice/collector/GetStatusEventHandler.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -30,43 +30,37 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * The eventhandler for handling the events by the GetStatusClient.
+ * The EventHandler for handling the events by the GetStatusClient.
  */
 public class GetStatusEventHandler implements EventHandler {
-    /** The log.*/
     private final Logger log = LoggerFactory.getLogger(GetStatusEventHandler.class);
-    /** The store for the status results. */
     private final StatusStore statusStore;
-    /** The alarm dispatcher*/
     private final MonitorAlerter alerter;
 
     /**
-     * Constructor.
-     * @param statusStore The store for the status results.
+     * @param statusStore     The store for the status results.
      * @param alarmDispatcher The alarm dispatcher.
      */
     public GetStatusEventHandler(StatusStore statusStore, MonitorAlerter alarmDispatcher) {
         this.statusStore = statusStore;
         this.alerter = alarmDispatcher;
     }
-    
+
     @Override
     public void handleEvent(OperationEvent event) {
         log.debug("Got event: " + event);
-        
-        switch(event.getEventType()) {
+
+        switch (event.getEventType()) {
             case COMPONENT_COMPLETE:
-                StatusCompleteContributorEvent statusEvent = (StatusCompleteContributorEvent) event; 
+                StatusCompleteContributorEvent statusEvent = (StatusCompleteContributorEvent) event;
                 statusStore.updateStatus(statusEvent.getContributorID(), statusEvent.getStatus());
                 break;
             case COMPLETE:
-                alerter.checkStatuses();
-                break;
             case FAILED:
                 alerter.checkStatuses();
                 break;
             default:
                 break;
-        }  
+        }
     }
 }
diff --git a/bitrepository-monitoring-service/src/main/java/org/bitrepository/monitoringservice/collector/StatusCollector.java b/bitrepository-monitoring-service/src/main/java/org/bitrepository/monitoringservice/collector/StatusCollector.java
index 8d9da227d..3b5923e5b 100644
--- a/bitrepository-monitoring-service/src/main/java/org/bitrepository/monitoringservice/collector/StatusCollector.java
+++ b/bitrepository-monitoring-service/src/main/java/org/bitrepository/monitoringservice/collector/StatusCollector.java
@@ -5,78 +5,73 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.monitoringservice.collector;
 
-import java.util.Timer;
-import java.util.TimerTask;
-
 import org.bitrepository.access.getstatus.GetStatusClient;
 import org.bitrepository.client.eventhandler.EventHandler;
 import org.bitrepository.common.settings.Settings;
 import org.bitrepository.monitoringservice.alarm.MonitorAlerter;
 import org.bitrepository.monitoringservice.status.StatusStore;
 
+import java.util.Timer;
+import java.util.TimerTask;
+
 /**
  * The collector of status messages.
  */
 public class StatusCollector {
-    /** The getStatusClient */
-    private GetStatusClient getStatusClient;
-    /** The store for the status results.*/
+    private final GetStatusClient getStatusClient;
     private final StatusStore statusStore;
-    /** The EventHandler */
-    private EventHandler eventHandler;
-    /** Defines that the timer is a daemon thread. */
+    private final EventHandler eventHandler;
     private static final Boolean TIMER_IS_DAEMON = true;
-    /** The name of the timer.*/
     private static final String NAME_OF_TIMER = "GetStatus collection timer";
-    /** Timer for collecting statuses on a regular basis */
     private static final Timer timer = new Timer(NAME_OF_TIMER, TIMER_IS_DAEMON);
-    /** Time between getStatus collections */
     private final long collectionInterval;
-    
+
     /**
-     * Constructor.
      * @param getStatusClient The status client.
-     * @param settings The settings.
-     * @param statusStore The storage for the status results.
-     * @param alerter The alerter.
+     * @param settings        The settings.
+     * @param statusStore     The storage for the status results.
+     * @param alerter         The alerter.
      */
-    public StatusCollector(GetStatusClient getStatusClient, Settings settings, StatusStore statusStore, 
-            MonitorAlerter alerter) {
+    public StatusCollector(GetStatusClient getStatusClient, Settings settings, StatusStore statusStore, MonitorAlerter alerter) {
         this.getStatusClient = getStatusClient;
         eventHandler = new GetStatusEventHandler(statusStore, alerter);
         this.statusStore = statusStore;
         collectionInterval = settings.getReferenceSettings().getMonitoringServiceSettings().getCollectionInterval();
     }
-    
-    /** Start the collection of statuses */
+
+    /**
+     * Start the collection of statuses
+     */
     public void start() {
         timer.schedule(new StatusCollectorTimerTask(), 0, collectionInterval);
     }
-    
-    /** Stop the collection of statuses */
+
+    /**
+     * Stop the collection of statuses
+     */
     public void stop() {
         timer.cancel();
     }
-    
+
     /**
-     * The timertask for collecting the status.
-     * Tells the store that a new status request has been issued, and then starts the conversation for retrieving the 
+     * The timer task for collecting the status.
+     * Tells the store that a new status request has been issued, and then starts the conversation for retrieving the
      * status from all the contributors.
      */
     private class StatusCollectorTimerTask extends TimerTask {
diff --git a/bitrepository-monitoring-service/src/main/java/org/bitrepository/monitoringservice/status/ComponentStatus.java b/bitrepository-monitoring-service/src/main/java/org/bitrepository/monitoringservice/status/ComponentStatus.java
index 6e7ca70a5..a282c2f2c 100644
--- a/bitrepository-monitoring-service/src/main/java/org/bitrepository/monitoringservice/status/ComponentStatus.java
+++ b/bitrepository-monitoring-service/src/main/java/org/bitrepository/monitoringservice/status/ComponentStatus.java
@@ -5,45 +5,33 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.monitoringservice.status;
 
-import javax.xml.datatype.XMLGregorianCalendar;
-
 import org.bitrepository.bitrepositoryelements.ResultingStatus;
 
-/**
- * Class to encapsulate the status of a component.  
- */
+import javax.xml.datatype.XMLGregorianCalendar;
+
 public class ComponentStatus {
-    /** The number of missing replies.*/
     private int numberOfMissingReplies;
-    /** The current status code.*/
     private ComponentStatusCode status;
-    /** The date for the latest reply.*/
     private XMLGregorianCalendar lastReply;
-    /** The status information of the latest reply.*/
     private String info;
-    /** Indication whether an alarm has been sent due to the components status */
     private Boolean alarmed;
-    
-    
-    /**
-     * Constructor 
-     */
+
     public ComponentStatus() {
         numberOfMissingReplies = 0;
         status = ComponentStatusCode.UNKNOWN;
@@ -51,10 +39,11 @@ public ComponentStatus() {
         info = "No status received yet.";
         alarmed = false;
     }
-    
+
     /**
      * Update the status of a component with the given results.
-     * @param resultingStatus FIXME
+     *
+     * @param resultingStatus The status will be updated to the string value of the status code.
      */
     public void updateStatus(ResultingStatus resultingStatus) {
         numberOfMissingReplies = 0;
@@ -65,28 +54,28 @@ public void updateStatus(ResultingStatus resultingStatus) {
     }
 
     /**
-     * Add another missing reply.
+     * Updates the number of missing replies by exactly one.
      */
-    public void updateReplys() {
+    public void updateReplies() {
         numberOfMissingReplies++;
     }
-    
+
     /**
      * Marks the component as unresponsive.
      */
     public void markAsUnresponsive() {
         status = ComponentStatusCode.UNRESPONSIVE;
     }
-    
+
     /**
-     * @return The number of missing replies in a row.
+     * @return The number of missing replies.
      */
     public int getNumberOfMissingReplies() {
         return numberOfMissingReplies;
     }
 
     /**
-     * @return The code for the latest reply.
+     * @return The status code for the latest reply.
      */
     public ComponentStatusCode getStatus() {
         return status;
@@ -95,22 +84,25 @@ public ComponentStatusCode getStatus() {
     /**
      * @return The date for the latest reply.
      */
-    public XMLGregorianCalendar getLastReply() {
+    public XMLGregorianCalendar getLastReplyDate() {
         return lastReply;
     }
 
     /**
-     * @return The latest status message.
+     * @return The information message from the latest reply.
      */
     public String getInfo() {
         return info;
-    }    
-    
+    }
+
+    /**
+     * @return Returns a {@link Boolean} indicating whether the component has invoked an alarm.
+     */
     public Boolean hasAlarmed() {
-    	return alarmed;
+        return alarmed;
     }
-    
+
     public void alarmed() {
-    	alarmed = true;
+        alarmed = true;
     }
 }
diff --git a/bitrepository-monitoring-service/src/main/java/org/bitrepository/monitoringservice/status/ComponentStatusCode.java b/bitrepository-monitoring-service/src/main/java/org/bitrepository/monitoringservice/status/ComponentStatusCode.java
index d2ffd1c29..0090306da 100644
--- a/bitrepository-monitoring-service/src/main/java/org/bitrepository/monitoringservice/status/ComponentStatusCode.java
+++ b/bitrepository-monitoring-service/src/main/java/org/bitrepository/monitoringservice/status/ComponentStatusCode.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -22,20 +22,15 @@
 package org.bitrepository.monitoringservice.status;
 
 /**
- * Enumeration of possible status states for a component.  
+ * Enumeration of possible status states for a component.
  */
 public enum ComponentStatusCode {
-    /** If no status is known for the given component.*/
     UNKNOWN,
-    /** If the component is fine.*/
     OK,
-    /** If the component has reported a warning.*/
     WARNING,
-    /** If the component has reported an error.*/
     ERROR,
-    /** If the component has become unresponsive.*/
     UNRESPONSIVE;
-    
+
     /**
      * @return The value of the status.
      */
diff --git a/bitrepository-monitoring-service/src/main/java/org/bitrepository/monitoringservice/status/ComponentStatusStore.java b/bitrepository-monitoring-service/src/main/java/org/bitrepository/monitoringservice/status/ComponentStatusStore.java
index 0d331ee31..327d4f153 100644
--- a/bitrepository-monitoring-service/src/main/java/org/bitrepository/monitoringservice/status/ComponentStatusStore.java
+++ b/bitrepository-monitoring-service/src/main/java/org/bitrepository/monitoringservice/status/ComponentStatusStore.java
@@ -21,15 +21,15 @@
  */
 package org.bitrepository.monitoringservice.status;
 
+import org.bitrepository.bitrepositoryelements.ResultingStatus;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
-import org.bitrepository.bitrepositoryelements.ResultingStatus;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
  * Storage for the status of the different components.
  */
@@ -62,7 +62,7 @@ public synchronized void updateStatus(String componentID, ResultingStatus status
     @Override
     public synchronized void updateReplyCounts() {
         for(String ID : statusMap.keySet()) {
-            statusMap.get(ID).updateReplys();
+            statusMap.get(ID).updateReplies();
         }
     }
     
diff --git a/bitrepository-monitoring-service/src/main/java/org/bitrepository/monitoringservice/status/StatusStore.java b/bitrepository-monitoring-service/src/main/java/org/bitrepository/monitoringservice/status/StatusStore.java
index 98f5a7d5b..9087fe96d 100644
--- a/bitrepository-monitoring-service/src/main/java/org/bitrepository/monitoringservice/status/StatusStore.java
+++ b/bitrepository-monitoring-service/src/main/java/org/bitrepository/monitoringservice/status/StatusStore.java
@@ -5,44 +5,45 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.monitoringservice.status;
 
-import java.util.Map;
-
 import org.bitrepository.bitrepositoryelements.ResultingStatus;
 
+import java.util.Map;
+
 /**
  * Interface for the storage of statuses.
  */
 public interface StatusStore {
     /**
      * Updates the status of a given component.
+     *
      * @param componentID The id of the component to update.
-     * @param status The resulting status for the given component.
+     * @param status      The resulting status for the given component.
      */
     void updateStatus(String componentID, ResultingStatus status);
-    
+
     /**
      * Tells the store that new statuses have been requested from the components.
      * This should increase the 'missingReplies' for each component, and whenever the component delivers its
      * reply, then the 'missingReplies' are set to zero again.
      */
     void updateReplyCounts();
-    
+
     /**
      * @return The mapping between components and their status.
      */
diff --git a/bitrepository-monitoring-service/src/main/java/org/bitrepository/monitoringservice/webservice/MonitoringServiceContextListener.java b/bitrepository-monitoring-service/src/main/java/org/bitrepository/monitoringservice/webservice/MonitoringServiceContextListener.java
index a01a298f5..13121d159 100644
--- a/bitrepository-monitoring-service/src/main/java/org/bitrepository/monitoringservice/webservice/MonitoringServiceContextListener.java
+++ b/bitrepository-monitoring-service/src/main/java/org/bitrepository/monitoringservice/webservice/MonitoringServiceContextListener.java
@@ -1,23 +1,23 @@
 /*
  * #%L
  * Bitrepository Audit Trail Service
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -45,7 +45,7 @@ public LifeCycledService getService() {
     }
 
     @Override
-    public void initialize(String configutrationDir) {
-        MonitoringServiceFactory.init(configutrationDir);        
+    public void initialize(String configurationDir) {
+        MonitoringServiceFactory.init(configurationDir);
     }
 }
diff --git a/bitrepository-monitoring-service/src/main/java/org/bitrepository/monitoringservice/webservice/RestMonitoringService.java b/bitrepository-monitoring-service/src/main/java/org/bitrepository/monitoringservice/webservice/RestMonitoringService.java
index c1732759e..9c8b89550 100644
--- a/bitrepository-monitoring-service/src/main/java/org/bitrepository/monitoringservice/webservice/RestMonitoringService.java
+++ b/bitrepository-monitoring-service/src/main/java/org/bitrepository/monitoringservice/webservice/RestMonitoringService.java
@@ -5,66 +5,65 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.monitoringservice.webservice;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
 import org.bitrepository.common.utils.TimeUtils;
 import org.bitrepository.monitoringservice.MonitoringService;
 import org.bitrepository.monitoringservice.MonitoringServiceFactory;
 import org.bitrepository.monitoringservice.status.ComponentStatus;
 
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
 @Path("/MonitoringService")
 public class RestMonitoringService {
-    
-    private MonitoringService service;
-    
+    private final MonitoringService service;
+
     public RestMonitoringService() {
         service = MonitoringServiceFactory.getMonitoringService();
     }
-    
+
     @GET
     @Path("/getMonitoringConfiguration/")
     @Produces("application/json")
     public List<WebConfOption> getMonitoringServiceConfiguration() {
         List<WebConfOption> options = new ArrayList<>();
-        
+
         options.add(new WebConfOption("Check interval", TimeUtils.millisecondsToHuman(service.getCollectionInterval())));
         options.add(new WebConfOption("Max retries", Long.toString(service.getMaxRetries())));
-        
+
         return options;
     }
-    
+
     @GET
     @Path("/getComponentStatus/")
     @Produces("application/json")
     public List<WebStatus> getComponentStatus() {
         Map<String, ComponentStatus> statusMap = service.getStatus();
         List<WebStatus> statuses = new ArrayList<>();
-        
-        for(String component : statusMap.keySet()) {
+
+        for (String component : statusMap.keySet()) {
             statuses.add(new WebStatus(component, statusMap.get(component)));
         }
         return statuses;
     }
-    
+
 }
diff --git a/bitrepository-monitoring-service/src/main/java/org/bitrepository/monitoringservice/webservice/WebConfOption.java b/bitrepository-monitoring-service/src/main/java/org/bitrepository/monitoringservice/webservice/WebConfOption.java
index 005e18486..cd66bb711 100644
--- a/bitrepository-monitoring-service/src/main/java/org/bitrepository/monitoringservice/webservice/WebConfOption.java
+++ b/bitrepository-monitoring-service/src/main/java/org/bitrepository/monitoringservice/webservice/WebConfOption.java
@@ -8,12 +8,12 @@
  * it under the terms of the GNU Lesser General Public License as
  * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
@@ -29,32 +29,31 @@ public class WebConfOption {
 
     private String confOption;
     private String confValue;
-    
+
     public WebConfOption() {}
-    
+
     public WebConfOption(String option, String value) {
         this.confOption = option;
         this.confValue = value;
     }
-    
+
     @XmlElement(name = "confOption")
     public String getConfOption() {
         return confOption;
     }
-    
+
     public void setConfOption(String confOption) {
         this.confOption = confOption;
     }
-    
+
     @XmlElement(name = "confValue")
     public String getConfValue() {
         return confValue;
     }
-    
+
     public void setConfValue(String confValue) {
         this.confValue = confValue;
     }
-    
-    
-    
+
+
 }
diff --git a/bitrepository-monitoring-service/src/main/java/org/bitrepository/monitoringservice/webservice/WebStatus.java b/bitrepository-monitoring-service/src/main/java/org/bitrepository/monitoringservice/webservice/WebStatus.java
index 57db6a025..75d6211ff 100644
--- a/bitrepository-monitoring-service/src/main/java/org/bitrepository/monitoringservice/webservice/WebStatus.java
+++ b/bitrepository-monitoring-service/src/main/java/org/bitrepository/monitoringservice/webservice/WebStatus.java
@@ -8,12 +8,12 @@
  * it under the terms of the GNU Lesser General Public License as
  * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
@@ -21,70 +21,69 @@
  */
 package org.bitrepository.monitoringservice.webservice;
 
+import org.bitrepository.common.utils.TimeUtils;
+import org.bitrepository.monitoringservice.status.ComponentStatus;
+
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.datatype.XMLGregorianCalendar;
 
-import org.bitrepository.common.utils.TimeUtils;
-import org.bitrepository.monitoringservice.status.ComponentStatus;
-
 @XmlRootElement
 public class WebStatus {
-
     private String componentID;
     private String status;
     private String info;
     private String timeStamp;
-    
+
     public WebStatus() {}
-    
+
     public WebStatus(String componentID, ComponentStatus status) {
         this.componentID = componentID;
         this.status = status.getStatus().toString();
         this.info = status.getInfo();
-        XMLGregorianCalendar cal = status.getLastReply();
-        if(cal != null) {
+        XMLGregorianCalendar cal = status.getLastReplyDate();
+        if (cal != null) {
             timeStamp = TimeUtils.shortDate(cal);
         } else {
-            timeStamp = "N/A";    
+            timeStamp = "N/A";
         }
     }
-    
+
     @XmlElement(name = "componentID")
     public String getComponentID() {
         return componentID;
     }
-    
+
     public void setComponentID(String componentID) {
         this.componentID = componentID;
     }
-    
+
     @XmlElement(name = "status")
     public String getStatus() {
         return status;
     }
-    
+
     public void setStatus(String status) {
         this.status = status;
     }
-    
+
     @XmlElement(name = "info")
     public String getInfo() {
         return info;
     }
-    
+
     public void setInfo(String info) {
         this.info = info;
     }
-    
+
     @XmlElement(name = "timeStamp")
     public String getTimeStamp() {
         return timeStamp;
     }
-    
+
     public void setTimeStamp(String timeStamp) {
         this.timeStamp = timeStamp;
     }
-    
-    
+
+
 }
diff --git a/bitrepository-monitoring-service/src/test/java/org/bitrepository/monitoringservice/MockStatusStore.java b/bitrepository-monitoring-service/src/test/java/org/bitrepository/monitoringservice/MockStatusStore.java
index 0ddc9556c..37b20a23d 100644
--- a/bitrepository-monitoring-service/src/test/java/org/bitrepository/monitoringservice/MockStatusStore.java
+++ b/bitrepository-monitoring-service/src/test/java/org/bitrepository/monitoringservice/MockStatusStore.java
@@ -21,13 +21,13 @@
  */
 package org.bitrepository.monitoringservice;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import org.bitrepository.bitrepositoryelements.ResultingStatus;
 import org.bitrepository.monitoringservice.status.ComponentStatus;
 import org.bitrepository.monitoringservice.status.StatusStore;
 
+import java.util.HashMap;
+import java.util.Map;
+
 public class MockStatusStore implements StatusStore {
 
     private int callsForUpdateStatus = 0;
diff --git a/bitrepository-monitoring-service/src/test/java/org/bitrepository/monitoringservice/alarm/MonitorAlerterTest.java b/bitrepository-monitoring-service/src/test/java/org/bitrepository/monitoringservice/alarm/MonitorAlerterTest.java
index f860b55fc..360a3d294 100644
--- a/bitrepository-monitoring-service/src/test/java/org/bitrepository/monitoringservice/alarm/MonitorAlerterTest.java
+++ b/bitrepository-monitoring-service/src/test/java/org/bitrepository/monitoringservice/alarm/MonitorAlerterTest.java
@@ -21,9 +21,6 @@
  */
 package org.bitrepository.monitoringservice.alarm;
 
-import java.math.BigInteger;
-import java.util.HashMap;
-import java.util.Map;
 import org.bitrepository.bitrepositoryelements.ResultingStatus;
 import org.bitrepository.bitrepositoryelements.StatusCode;
 import org.bitrepository.bitrepositoryelements.StatusInfo;
@@ -37,6 +34,10 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
+import java.math.BigInteger;
+import java.util.HashMap;
+import java.util.Map;
+
 public class MonitorAlerterTest extends IntegrationTest {
     
     @Test(groups = {"regressiontest"})
@@ -69,7 +70,7 @@ public void testMonitorAlerter() throws Exception {
         
         addStep("Check the status when a negative entry exists.", 
                 "Should send an alarm and make another call for the GetStatusMap");
-        cs.updateReplys();
+        cs.updateReplies();
         store.statuses.put(componentID, cs);
         alerter.checkStatuses();
         Assert.assertEquals(store.getCallsForGetStatusMap(), 3);
diff --git a/bitrepository-monitoring-service/src/test/java/org/bitrepository/monitoringservice/status/ComponentStatusStoreTest.java b/bitrepository-monitoring-service/src/test/java/org/bitrepository/monitoringservice/status/ComponentStatusStoreTest.java
index 97ee3d8b4..c93d24701 100644
--- a/bitrepository-monitoring-service/src/test/java/org/bitrepository/monitoringservice/status/ComponentStatusStoreTest.java
+++ b/bitrepository-monitoring-service/src/test/java/org/bitrepository/monitoringservice/status/ComponentStatusStoreTest.java
@@ -21,10 +21,6 @@
  */
 package org.bitrepository.monitoringservice.status;
 
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
 import org.bitrepository.bitrepositoryelements.ResultingStatus;
 import org.bitrepository.bitrepositoryelements.StatusCode;
 import org.bitrepository.bitrepositoryelements.StatusInfo;
@@ -36,6 +32,10 @@
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
 public class ComponentStatusStoreTest extends ExtendedTestCase {
     Settings settings;
     
@@ -61,7 +61,7 @@ public void testComponentStatus() throws Exception {
         Assert.assertNotNull(statuses.get(componentId));
         Assert.assertEquals(statuses.get(componentId).getInfo(), newStatus.getInfo());
         Assert.assertEquals(statuses.get(componentId).getNumberOfMissingReplies(), newStatus.getNumberOfMissingReplies());
-        Assert.assertEquals(statuses.get(componentId).getLastReply(), newStatus.getLastReply());
+        Assert.assertEquals(statuses.get(componentId).getLastReplyDate(), newStatus.getLastReplyDate());
         Assert.assertEquals(statuses.get(componentId).getStatus(), newStatus.getStatus());
 
         addStep("Update the replay counts and validate ", "it should increases the 'number of missing replies' by 1");
@@ -71,7 +71,7 @@ public void testComponentStatus() throws Exception {
         Assert.assertNotNull(statuses.get(componentId));
         Assert.assertEquals(statuses.get(componentId).getInfo(), newStatus.getInfo());
         Assert.assertEquals(statuses.get(componentId).getNumberOfMissingReplies(), 1);
-        Assert.assertEquals(statuses.get(componentId).getLastReply(), newStatus.getLastReply());
+        Assert.assertEquals(statuses.get(componentId).getLastReplyDate(), newStatus.getLastReplyDate());
         Assert.assertEquals(statuses.get(componentId).getStatus(), newStatus.getStatus());
         
         addStep("Test what happens when an invalid component id attempted to be updated.", "Should not affect content.");
@@ -81,7 +81,7 @@ public void testComponentStatus() throws Exception {
         Assert.assertNotNull(statuses.get(componentId));
         Assert.assertEquals(statuses.get(componentId).getInfo(), newStatus.getInfo());
         Assert.assertEquals(statuses.get(componentId).getNumberOfMissingReplies(), 1);
-        Assert.assertEquals(statuses.get(componentId).getLastReply(), newStatus.getLastReply());
+        Assert.assertEquals(statuses.get(componentId).getLastReplyDate(), newStatus.getLastReplyDate());
         Assert.assertEquals(statuses.get(componentId).getStatus(), newStatus.getStatus());
         
         addStep("Try giving it a positive status", "Should be inserted into the store.");
@@ -92,7 +92,7 @@ public void testComponentStatus() throws Exception {
         Assert.assertNotNull(statuses.get(componentId));
         Assert.assertEquals(statuses.get(componentId).getInfo(), resStatus.getStatusInfo().getStatusText());
         Assert.assertEquals(statuses.get(componentId).getNumberOfMissingReplies(), 0);
-        Assert.assertEquals(statuses.get(componentId).getLastReply(), resStatus.getStatusTimestamp());
+        Assert.assertEquals(statuses.get(componentId).getLastReplyDate(), resStatus.getStatusTimestamp());
         Assert.assertEquals(statuses.get(componentId).getStatus().value(), resStatus.getStatusInfo().getStatusCode().name());
     }
     
diff --git a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/Pillar.java b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/Pillar.java
index 7ee32725a..3602346a0 100644
--- a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/Pillar.java
+++ b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/Pillar.java
@@ -5,24 +5,22 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.pillar;
 
-import javax.jms.JMSException;
-
 import org.bitrepository.common.ArgumentValidator;
 import org.bitrepository.common.settings.Settings;
 import org.bitrepository.common.utils.SettingsUtils;
@@ -32,41 +30,34 @@
 import org.bitrepository.pillar.store.StorageModel;
 import org.bitrepository.protocol.messagebus.MessageBus;
 import org.bitrepository.service.scheduler.JobScheduler;
-import org.bitrepository.service.scheduler.TimerbasedScheduler;
+import org.bitrepository.service.scheduler.TimerBasedScheduler;
 import org.bitrepository.service.workflow.SchedulableJob;
 import org.bitrepository.settings.referencesettings.PillarType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.jms.JMSException;
+
 /**
  * Class for the Reference Pillar.
  * This will either be a File Reference Pillar or a Checksum Reference Pillar, depending on the type of
  * storage model.
  */
 public class Pillar {
-    /** The log.*/
-    private Logger log = LoggerFactory.getLogger(getClass());
-    /** The messagebus for the pillar.*/
+    private final Logger log = LoggerFactory.getLogger(getClass());
     private final MessageBus messageBus;
-    /** The settings.*/
     private final Settings settings;
-    /** The storage model for all the file data.*/
     private final StorageModel pillarModel;
-    
-    /** The type of pillar.*/
-    private final PillarType pillarType;
     private final PillarMediator mediator;
-    
-    /** The scheduler for the recalculation workflows.*/
     private final JobScheduler scheduler;
-    /** The default time for running the recalculation workflow, when the settings is not set.
-     * The default is every hour. */
+    /**
+     * The default time for running the recalculation workflow, when the settings are not set.
+     * The default is every hour.
+     */
     private static final Long DEFAULT_RECALCULATION_WORKFLOW_TIME = 3600000L;
 
     /**
-     * Constructor.
-     *
-     * @param messageBus  The messagebus for the communication.
+     * @param messageBus  The message-bus for the communication.
      * @param settings    The settings for the pillar.
      * @param pillarModel The storage model for the pillar.
      * @param context     The context for the message handler.
@@ -78,35 +69,36 @@ public Pillar(MessageBus messageBus, Settings settings, StorageModel pillarModel
         SettingsUtils.initialize(settings);
         this.settings = settings;
         this.pillarModel = pillarModel;
-        this.pillarType = settings.getReferenceSettings().getPillarSettings().getPillarType(); 
+
+        PillarType pillarType = settings.getReferenceSettings().getPillarSettings().getPillarType();
 
         log.info("Starting the ReferencePillar of type '" + pillarType + "'.");
         messageBus.setCollectionFilter(context.getPillarCollections());
         mediator = new PillarMediator(messageBus, context, pillarModel);
         mediator.start();
-        
-        this.scheduler = new TimerbasedScheduler();
-        if(pillarType == PillarType.FILE) {
+
+        this.scheduler = new TimerBasedScheduler();
+        if (pillarType == PillarType.FILE) {
             initializeWorkflows();
         }
     }
-    
+
     /**
      * Initializes one RecalculateChecksums workflow for each collection.
      */
     private void initializeWorkflows() {
         Long interval = DEFAULT_RECALCULATION_WORKFLOW_TIME;
-        if(settings.getReferenceSettings().getPillarSettings().getRecalculateOldChecksumsInterval() != null) {
+        if (settings.getReferenceSettings().getPillarSettings().getRecalculateOldChecksumsInterval() != null) {
             interval = settings.getReferenceSettings().getPillarSettings()
                     .getRecalculateOldChecksumsInterval().longValue();
         }
-        for(String collectionID : SettingsUtils.getCollectionIDsForPillar(
+        for (String collectionID : SettingsUtils.getCollectionIDsForPillar(
                 settings.getReferenceSettings().getPillarSettings().getPillarID())) {
             SchedulableJob workflow = new RecalculateChecksumJob(collectionID, pillarModel);
             scheduler.schedule(workflow, interval);
         }
     }
-    
+
     /**
      * Closes the ReferencePillar.
      */
@@ -117,7 +109,7 @@ public void close() {
             pillarModel.close();
             log.info("ReferencePillar stopped!");
         } catch (JMSException e) {
-            log.warn("Could not close the messagebus.", e);
+            log.warn("Could not close the message-bus.", e);
         }
     }
 }
diff --git a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/PillarComponentFactory.java b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/PillarComponentFactory.java
index 50a8f5e7b..8f55963bc 100644
--- a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/PillarComponentFactory.java
+++ b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/PillarComponentFactory.java
@@ -1,31 +1,29 @@
 /*
  * #%L
  * Bitrepository Integration
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.pillar;
 
-import java.lang.reflect.Constructor;
-
 import org.bitrepository.common.filestore.FileStore;
 import org.bitrepository.common.settings.Settings;
 import org.bitrepository.common.settings.XMLFileSettingsLoader;
@@ -58,21 +56,20 @@
 import org.bitrepository.service.database.DatabaseManager;
 import org.bitrepository.settings.referencesettings.PillarType;
 
+import java.lang.reflect.Constructor;
+
 /**
  * Component factory for this module.
  */
 public final class PillarComponentFactory {
-    /** The singleton instance. */
     private static PillarComponentFactory instance;
 
     /**
-     * Instantiation of this singleton.
-     *
      * @return The singleton instance of this factory class.
      */
     public static synchronized PillarComponentFactory getInstance() {
         // ensure singleton.
-        if(instance == null) {
+        if (instance == null) {
             instance = new PillarComponentFactory();
         }
         return instance;
@@ -86,9 +83,10 @@ private PillarComponentFactory() {
 
     /**
      * Creates the pillar from on settings, key-file and pillar-ID.
+     *
      * @param pathToSettings The path to the settings file.
-     * @param pathToKeyFile The path to the key file (can be empty).
-     * @param pillarID The id of the pillar (if null, the pillar-id in settings are used).
+     * @param pathToKeyFile  The path to the key file (can be empty).
+     * @param pillarID       The id of the pillar (if null, the pillar-id in settings are used).
      * @return The pillar.
      */
     public Pillar createPillar(String pathToSettings, String pathToKeyFile, String pillarID) {
@@ -96,19 +94,20 @@ public Pillar createPillar(String pathToSettings, String pathToKeyFile, String p
 
         SecurityManager securityManager = loadSecurityManager(pathToKeyFile, settings);
         MessageBus messageBus = ProtocolComponentFactory.getInstance().getMessageBus(settings, securityManager);
-        
+
         return createPillar(settings, messageBus);
     }
-    
+
     /**
      * Creates a pillar from settings and message-bus.
-     * @param settings The instantiated settings.
-     * @param messageBus The messagebus.
+     *
+     * @param settings   The instantiated settings.
+     * @param messageBus The message-bus.
      * @return The pillar.
      */
     public Pillar createPillar(Settings settings, MessageBus messageBus) {
         ChecksumStore cache = getChecksumStore(settings);
-        AuditTrailManager audits = getAuditTrailManager(settings);        
+        AuditTrailManager audits = getAuditTrailManager(settings);
         PillarAlarmDispatcher alarmDispatcher = new PillarAlarmDispatcher(settings, messageBus);
         ResponseDispatcher responseDispatcher = new ResponseDispatcher(settings, messageBus);
 
@@ -121,12 +120,13 @@ public Pillar createPillar(Settings settings, MessageBus messageBus) {
                 alarmDispatcher,
                 audits,
                 ProtocolComponentFactory.getInstance().getFileExchange(settings));
-        
-        return new Pillar(messageBus, settings, pillarModel, context);        
+
+        return new Pillar(messageBus, settings, pillarModel, context);
     }
-    
+
     /**
      * Instantiates the ChecksumStore.
+     *
      * @param settings The settings.
      * @return The ChecksumStore.
      */
@@ -134,9 +134,10 @@ private ChecksumStore getChecksumStore(Settings settings) {
         DatabaseManager checksumDatabaseManager = new ChecksumDatabaseManager(settings);
         return new ChecksumDAO(checksumDatabaseManager);
     }
-    
+
     /**
      * Instantiates the AuditTrailManager.
+     *
      * @param settings The settings.
      * @return The AuditTrailManager.
      */
@@ -147,18 +148,19 @@ private AuditTrailManager getAuditTrailManager(Settings settings) {
                 settings.getComponentID());
     }
 
-    
+
     /**
      * Retrieves the FileStore defined in the settings.
+     *
      * @param settings The settings.
-     * @return The filestore from settings, or the CollectionArchiveManager, if the setting is missing.
+     * @return The file-store from settings, or the CollectionArchiveManager, if the setting is missing.
      */
     @SuppressWarnings("unchecked")
     private FileStore getFileStore(Settings settings) {
-        if(settings.getReferenceSettings().getPillarSettings().getFileStoreClass() == null) {
+        if (settings.getReferenceSettings().getPillarSettings().getFileStoreClass() == null) {
             return new CollectionArchiveManager(settings);
         }
-        
+
         try {
             Class<FileStore> fsClass = (Class<FileStore>) Class.forName(
                     settings.getReferenceSettings().getPillarSettings().getFileStoreClass());
@@ -168,20 +170,21 @@ private FileStore getFileStore(Settings settings) {
             throw new CoordinationLayerException("Could not instantiate the FileStore", e);
         }
     }
-    
+
     /**
      * Instantiates the PillarModel.
-     * @param settings The settings.
-     * @param cache The ChecksumCache.
+     *
+     * @param settings        The settings.
+     * @param cache           The ChecksumCache.
      * @param alarmDispatcher The alarm dispatcher.
      * @return The PillarModel, either for FullReferencePillar or ChecksumPillar.
      */
     private StorageModel getPillarModel(Settings settings, ChecksumStore cache, AlarmDispatcher alarmDispatcher) {
         PillarType pillarType = settings.getReferenceSettings().getPillarSettings().getPillarType();
-        if(pillarType == PillarType.CHECKSUM) {
+        if (pillarType == PillarType.CHECKSUM) {
             return new ChecksumStorageModel(cache, alarmDispatcher, settings,
                     ProtocolComponentFactory.getInstance().getFileExchange(settings));
-        } else if(pillarType == PillarType.FILE) {
+        } else if (pillarType == PillarType.FILE) {
             FileStore archive = getFileStore(settings);
             return new FileStorageModel(archive, cache, alarmDispatcher, settings,
                     ProtocolComponentFactory.getInstance().getFileExchange(settings));
@@ -190,19 +193,24 @@ private StorageModel getPillarModel(Settings settings, ChecksumStore cache, Alar
         }
     }
 
-    /** The default path for the settings in the development.*/
+    /**
+     * The default path for the settings in the development.
+     */
     private static final String DEFAULT_PATH_TO_SETTINGS = "conf";
-    /** The default path for the settings in the development.*/
+    /**
+     * The default path for the settings in the development.
+     */
     private static final String DEFAULT_PATH_TO_KEY_FILE = "conf/pillar.pem";
 
     /**
      * Method for retrieving the settings for the launcher.
+     *
      * @param pathToSettings The path to the settings. If it is null or empty, then the default path is used.
      * @return The settings.
      */
     private static Settings loadSettings(String pillarID, String pathToSettings) {
         String settingsPath;
-        if(pathToSettings == null || pathToSettings.isEmpty()) {
+        if (pathToSettings == null || pathToSettings.isEmpty()) {
             settingsPath = DEFAULT_PATH_TO_SETTINGS;
         } else {
             settingsPath = pathToSettings;
@@ -216,13 +224,14 @@ private static Settings loadSettings(String pillarID, String pathToSettings) {
 
     /**
      * Instantiates the security manager based on the settings and the path to the key file.
+     *
      * @param pathToPrivateKeyFile The path to the key file.
-     * @param settings The settings.
+     * @param settings             The settings.
      * @return The security manager.
      */
     private static BasicSecurityManager loadSecurityManager(String pathToPrivateKeyFile, Settings settings) {
         String privateKeyFile;
-        if(pathToPrivateKeyFile == null || pathToPrivateKeyFile.isEmpty()) {
+        if (pathToPrivateKeyFile == null || pathToPrivateKeyFile.isEmpty()) {
             privateKeyFile = DEFAULT_PATH_TO_KEY_FILE;
         } else {
             privateKeyFile = pathToPrivateKeyFile;
diff --git a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/PillarLauncher.java b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/PillarLauncher.java
index 0706ca32a..281114317 100644
--- a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/PillarLauncher.java
+++ b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/PillarLauncher.java
@@ -1,23 +1,24 @@
 /*
  * #%L
- * Bitmagasin integrationstest
- * 
+ * BitRepository IntegrationTests
+ *
  * $Id: ReferencePillarLauncher.java 685 2012-01-06 16:35:17Z jolf $
- * $HeadURL: https://sbforge.org/svn/bitrepository/bitrepository-reference/trunk/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/ReferencePillarLauncher.java $
+ * $HeadURL: https://sbforge.org/svn/bitrepository/bitrepository-reference/trunk/bitrepository-reference-pillar/src/main/java/org
+ * /bitrepository/pillar/ReferencePillarLauncher.java $
  * %%
  * Copyright (C) 2010 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -27,7 +28,7 @@
 import org.bitrepository.common.settings.XMLFileSettingsLoader;
 
 /**
- * Method for launching the ReferencePillar. 
+ * Method for launching the ReferencePillar.
  * It just loads the configurations and uses them to create the PillarSettings needed for starting the ReferencePillar.
  */
 public final class PillarLauncher {
@@ -35,20 +36,20 @@ public final class PillarLauncher {
     /**
      * Private constructor. To prevent instantiation of this utility class.
      */
-    private PillarLauncher() { }
-    
+    private PillarLauncher() {}
+
     /**
      * @param args <ol>
-     * <li> The path to the directory containing the settings. See {@link XMLFileSettingsLoader} for details.</li>
-     * <li> The path to the private key file with the certificates for communication.</li>
-     * <li> The pillar's componentID.</li>
-     * </ol>
+     *             <li> The path to the directory containing the settings. See {@link XMLFileSettingsLoader} for details.</li>
+     *             <li> The path to the private key file with the certificates for communication.</li>
+     *             <li> The pillar's componentID.</li>
+     *             </ol>
      */
     public static void main(String[] args) {
         String pathToSettings = args[0];
-        String pathToKeyFile = args.length >=2 ? args[1] : null;
-        String pillarID =  args.length == 3 ? args[2]: null;
-        
+        String pathToKeyFile = args.length >= 2 ? args[1] : null;
+        String pillarID = args.length == 3 ? args[2] : null;
+
         Pillar pillar = PillarComponentFactory.getInstance().createPillar(pathToSettings, pathToKeyFile, pillarID);
         PillarRunner.launchPillar(pillar);
     }
diff --git a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/PillarRunner.java b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/PillarRunner.java
index 40ea332ae..2f42dcd90 100644
--- a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/PillarRunner.java
+++ b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/PillarRunner.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -25,15 +25,18 @@
  * Launches a given pillar.
  */
 public final class PillarRunner {
-    /** Private constructor, to avoid instantiation of this utility class.*/
+    private static final Object lock = new Object();
+
     private PillarRunner() {}
+
     /**
      * Method for launching the pillar.
+     *
      * @param pillar The pillar to run.
      */
     public static void launchPillar(Pillar pillar) {
         try {
-            synchronized(pillar) {
+            synchronized (lock) {
                 pillar.wait();
             }
         } catch (Exception e) {
diff --git a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/PillarSettingsProvider.java b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/PillarSettingsProvider.java
index 770124946..26df3dc5b 100644
--- a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/PillarSettingsProvider.java
+++ b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/PillarSettingsProvider.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -25,19 +25,16 @@
 import org.bitrepository.common.settings.SettingsProvider;
 import org.bitrepository.settings.referencesettings.ReferenceSettings;
 
-/**
- * The settings provider for the pillar.
- */
 public class PillarSettingsProvider extends SettingsProvider {
-    private String pillarID;
+    private final String pillarID;
 
     /**
-     * Creates a <code>SettingsProvider</code> which will use the provided <code>SettingsLoader</code> for loading the
+     * Creates a {@link SettingsProvider} which will use the provided {@link SettingsLoader} for loading the
      * settings.
      *
      * @param settingsReader Use for loading the settings.
-     * @param pillarID Optional pillarID if more than one reference pillar in the collection. If null the
-     *                  pillarID from the first pillar settings section in the reference settings wil be used.
+     * @param pillarID       Optional pillarID if more than one reference pillar in the collection. If null the
+     *                       pillarID from the first pillar settings section in the reference settings wil be used.
      */
     public PillarSettingsProvider(SettingsLoader settingsReader, String pillarID) {
         super(settingsReader, null);
@@ -45,7 +42,7 @@ public PillarSettingsProvider(SettingsLoader settingsReader, String pillarID) {
     }
 
     protected String getComponentID(ReferenceSettings referenceSettings) {
-        if(pillarID == null) {
+        if (pillarID == null) {
             return referenceSettings.getPillarSettings().getPillarID();
         } else {
             return pillarID;
diff --git a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/common/ChecksumDatabaseCreator.java b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/common/ChecksumDatabaseCreator.java
index 97f7f077e..4650dbd82 100644
--- a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/common/ChecksumDatabaseCreator.java
+++ b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/common/ChecksumDatabaseCreator.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -27,23 +27,24 @@
 import org.bitrepository.settings.referencesettings.DatabaseSpecifics;
 
 /**
- * Will create a checksum database.
- * Defines the concrete DatabaseSpecifics and sql script location,
- * all intelligence is located in the DatabaseCreator super class.
+ * Used to create a checksum database.<br>
+ * Defines the concrete DatabaseSpecifics and SQL-script location.
  *
- * @see DatabaseCreator
+ * @see DatabaseCreator DatabaseCreater
  */
 public class ChecksumDatabaseCreator extends DatabaseCreator {
-    /** Default location for the script for creating the Checksum database.*/
+    /**
+     * Default location for the script for creating the Checksum database.
+     */
     public static final String DEFAULT_CHECKSUM_DB_SCRIPT = "sql/derby/checksumDBCreation.sql";
 
     /**
      * @param args <ol>
-     * <li> The path to the directory containing the settings. See
-     * {@link org.bitrepository.common.settings.XMLFileSettingsLoader} for details.</li>
-     * <li> The database creation script as found in the classpath. Will revert to  DEFAULT_CHECKSUM_DB_SCRIPT =
-     * "sql/derby/checksumDBCreation.sql" if null.</li>
-     * </ol>
+     *             <li> The path to the directory containing the settings. See
+     *             {@link org.bitrepository.common.settings.XMLFileSettingsLoader} for details.</li>
+     *             <li> The database creation script as found in the classpath. Will revert to  DEFAULT_CHECKSUM_DB_SCRIPT =
+     *             "sql/derby/checksumDBCreation.sql" if null.</li>
+     *             </ol>
      */
     public static void main(String[] args) {
         ChecksumDatabaseCreator dbCreator = new ChecksumDatabaseCreator();
@@ -53,10 +54,8 @@ public static void main(String[] args) {
     }
 
     public void createChecksumDatabase(Settings settings, String pathToSqlCreationScript) {
-        DatabaseSpecifics databaseSpecifics =
-                settings.getReferenceSettings().getPillarSettings().getChecksumDatabase();
+        DatabaseSpecifics databaseSpecifics = settings.getReferenceSettings().getPillarSettings().getChecksumDatabase();
 
-        createDatabase(databaseSpecifics, pathToSqlCreationScript == null ? 
-                DEFAULT_CHECKSUM_DB_SCRIPT : pathToSqlCreationScript);
+        createDatabase(databaseSpecifics, pathToSqlCreationScript == null ? DEFAULT_CHECKSUM_DB_SCRIPT : pathToSqlCreationScript);
     }
 }
diff --git a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/common/MessageHandlerContext.java b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/common/MessageHandlerContext.java
index c7221ca8c..56c1436f9 100644
--- a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/common/MessageHandlerContext.java
+++ b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/common/MessageHandlerContext.java
@@ -5,24 +5,22 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.pillar.common;
 
-import java.util.List;
-
 import org.bitrepository.common.ArgumentValidator;
 import org.bitrepository.common.settings.Settings;
 import org.bitrepository.protocol.FileExchange;
@@ -30,6 +28,8 @@
 import org.bitrepository.service.contributor.ContributorContext;
 import org.bitrepository.service.contributor.ResponseDispatcher;
 
+import java.util.List;
+
 /**
  * Container for the context of the pillar, e.g. all the components needed for the message handling.
  */
@@ -42,8 +42,8 @@ public class MessageHandlerContext extends ContributorContext {
      *
      * @param settings           The settings.
      * @param pillarCollections  The collections which the pillar is part of.
-     * @param responseDispatcher The component for sending responses on the messagebus.
-     * @param alarmDispatcher    The component for dispatching alarms on the messagebus.
+     * @param responseDispatcher The component for sending responses on the message-bus.
+     * @param alarmDispatcher    The component for dispatching alarms on the message-bus.
      * @param auditTrailManager  The audit trail storage / manager.
      * @param fileExchange       The file exchange.
      */
diff --git a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/common/PillarAlarmDispatcher.java b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/common/PillarAlarmDispatcher.java
index 9ea3e1a18..a1c6f0b93 100644
--- a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/common/PillarAlarmDispatcher.java
+++ b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/common/PillarAlarmDispatcher.java
@@ -1,23 +1,23 @@
 /*
  * #%L
  * Bitrepository Integration
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -34,22 +34,20 @@
 import org.bitrepository.service.exception.IllegalOperationException;
 import org.bitrepository.service.exception.RequestHandlerException;
 
-/**
- * The class for dispatching alarms.
- */
 public class PillarAlarmDispatcher extends AlarmDispatcher {
-    
+
     /**
      * @param settings The settings for this alarm dispatcher.
-     * @param sender The sender for this alarm dispatcher.
+     * @param sender   The sender for this alarm dispatcher.
      */
     public PillarAlarmDispatcher(Settings settings, MessageSender sender) {
         super(settings, sender, settings.getReferenceSettings().getPillarSettings().getAlarmLevel());
     }
-    
+
     /**
      * Method for sending an alarm based on an IllegalArgumentException.
      * Is only send if the alarm level is 'WARNING', otherwise the exception is just logged.
+     *
      * @param exception The exception to base the alarm upon.
      */
     public void handleIllegalArgumentException(IllegalArgumentException exception) {
@@ -58,13 +56,14 @@ public void handleIllegalArgumentException(IllegalArgumentException exception) {
         Alarm ad = new Alarm();
         ad.setAlarmCode(AlarmCode.INCONSISTENT_REQUEST);
         ad.setAlarmText(exception.getMessage());
-        
+
         warning(ad);
     }
 
     /**
      * Sends an alarm for a RuntimeException. Such exceptions are sent unless the AlarmLevel is 'EMERGENCY',
      * otherwise the exception is just logged.
+     *
      * @param exception The exception causing the alarm.
      */
     public void handleRuntimeExceptions(RuntimeException exception) {
@@ -79,15 +78,16 @@ public void handleRuntimeExceptions(RuntimeException exception) {
 
     /**
      * Handles the case when the request causes a RequestHandlerException.
-     * @param e The exception causing this alarm case.
+     *
+     * @param e            The exception causing this alarm case.
      * @param collectionID The ID of the collection, where the exception occurred.
      */
     public void handleRequestException(RequestHandlerException e, String collectionID) {
         Alarm alarm = new Alarm();
-        
-        if(e.getResponseInfo().getResponseCode() == ResponseCode.REQUEST_NOT_UNDERSTOOD_FAILURE) {
+
+        if (e.getResponseInfo().getResponseCode() == ResponseCode.REQUEST_NOT_UNDERSTOOD_FAILURE) {
             alarm.setAlarmCode(AlarmCode.INVALID_MESSAGE);
-        } else if(e.getResponseInfo().getResponseCode() == ResponseCode.EXISTING_FILE_CHECKSUM_FAILURE
+        } else if (e.getResponseInfo().getResponseCode() == ResponseCode.EXISTING_FILE_CHECKSUM_FAILURE
                 || e.getResponseInfo().getResponseCode() == ResponseCode.NEW_FILE_CHECKSUM_FAILURE) {
             alarm.setAlarmCode(AlarmCode.CHECKSUM_ALARM);
         } else {
@@ -96,8 +96,8 @@ public void handleRequestException(RequestHandlerException e, String collectionI
 
         alarm.setAlarmText(e.getResponseInfo().getResponseText());
         alarm.setCollectionID(collectionID);
-        
-        if(e instanceof IllegalOperationException) {
+
+        if (e instanceof IllegalOperationException) {
             IllegalOperationException ioe = (IllegalOperationException) e;
             alarm.setFileID(ioe.getFileId());
             error(alarm);
diff --git a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/common/PillarAuditTrailDatabaseCreator.java b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/common/PillarAuditTrailDatabaseCreator.java
index 7240a1f2b..a22250cb0 100644
--- a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/common/PillarAuditTrailDatabaseCreator.java
+++ b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/common/PillarAuditTrailDatabaseCreator.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -30,16 +30,18 @@
  * Class for creating the audit trail contributor database for the pillar.
  */
 public class PillarAuditTrailDatabaseCreator extends DatabaseCreator {
-    /** Default location of the script for creating the audit trail contributor database.*/
+    /**
+     * Default location of the script for creating the audit trail contributor database.
+     */
     public static final String DEFAULT_AUDIT_TRAIL_DB_SCRIPT = "sql/derby/auditContributorDBCreation.sql";
 
     /**
      * @param args <ol>
-     * <li> The path to the directory containing the settings. See
-     * {@link org.bitrepository.common.settings.XMLFileSettingsLoader} for details.</li>
-     * <li> The database creation script as found in the classpath. Will revert to  DEFAULT_CHECKSUM_DB_SCRIPT =
-     * "sql/derby/checksumDBCreation.sql" if null.</li>
-     * </ol>
+     *             <li> The path to the directory containing the settings. See
+     *             {@link org.bitrepository.common.settings.XMLFileSettingsLoader} for details.</li>
+     *             <li> The database creation script as found in the classpath. Will revert to  DEFAULT_CHECKSUM_DB_SCRIPT =
+     *             "sql/derby/checksumDBCreation.sql" if null.</li>
+     *             </ol>
      */
     public static void main(String[] args) {
         PillarAuditTrailDatabaseCreator dbCreatorPillar = new PillarAuditTrailDatabaseCreator();
@@ -50,14 +52,15 @@ public static void main(String[] args) {
 
     /**
      * Creates the audit trail contributor database for the pillar.
-     * @param settings The settings for the pillar.
+     *
+     * @param settings                The settings for the pillar.
      * @param pathToSqlCreationScript The path to the script for creating the audit trail contributor database.
      */
     public void createAuditTrailContributorDatabase(Settings settings, String pathToSqlCreationScript) {
         DatabaseSpecifics databaseSpecifics =
                 settings.getReferenceSettings().getPillarSettings().getAuditTrailContributerDatabase();
 
-        createDatabase(databaseSpecifics, pathToSqlCreationScript == null ? 
+        createDatabase(databaseSpecifics, pathToSqlCreationScript == null ?
                 DEFAULT_AUDIT_TRAIL_DB_SCRIPT : pathToSqlCreationScript);
     }
 }
diff --git a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/common/SettingsHelper.java b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/common/SettingsHelper.java
index e72ca1003..d675669d1 100644
--- a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/common/SettingsHelper.java
+++ b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/common/SettingsHelper.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -22,22 +22,21 @@
 
 package org.bitrepository.pillar.common;
 
+import org.bitrepository.settings.repositorysettings.Collection;
+
 import java.util.ArrayList;
 import java.util.List;
 
-import org.bitrepository.settings.repositorysettings.Collection;
-
 /**
- *
- Provides functionality for creating data derived from the pillar settings
+ * Provides functionality for creating data derived from the pillar settings
  */
 public final class SettingsHelper {
-    /** Private constructor, to avoid instantiation of this utility class.*/
     private SettingsHelper() {}
-    
+
     /**
      * Calculates the list of pillars
-     * @param pillarID The ID of the pillar.
+     *
+     * @param pillarID    The ID of the pillar.
      * @param collections The collection for the whole repository.
      * @return all pillars in collections with the provided pillarID
      */
diff --git a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/DeleteFileRequestHandler.java b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/DeleteFileRequestHandler.java
index 1e6c3125a..a7b4711bd 100644
--- a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/DeleteFileRequestHandler.java
+++ b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/DeleteFileRequestHandler.java
@@ -1,23 +1,23 @@
 /*
  * #%L
  * Bitrepository Reference Pillar
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -44,16 +44,12 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/**
- * Class for handling the DeleteFile operation.
- */
 public class DeleteFileRequestHandler extends PerformRequestHandler<DeleteFileRequest> {
-    /** The log.*/
-    private Logger log = LoggerFactory.getLogger(getClass());
-    
+    private final Logger log = LoggerFactory.getLogger(getClass());
+
     /**
      * @param context The context for the message handling.
-     * @param model The storage model for the pillar.
+     * @param model   The storage model for the pillar.
      */
     protected DeleteFileRequestHandler(MessageHandlerContext context, StorageModel model) {
         super(context, model);
@@ -68,42 +64,40 @@ public Class<DeleteFileRequest> getRequestClass() {
     public MessageResponse generateFailedResponse(DeleteFileRequest request) {
         return createFinalResponse(request);
     }
-    
+
     @Override
-    protected void validateRequest(DeleteFileRequest request, MessageContext messageContext) 
+    protected void validateRequest(DeleteFileRequest request, MessageContext messageContext)
             throws RequestHandlerException {
         validateCollectionID(request);
         validatePillarId(request.getPillarID());
-        getPillarModel().verifyChecksumAlgorithm(request.getChecksumRequestForExistingFile(), 
-                request.getCollectionID());
-        if(request.getChecksumDataForExistingFile() != null) {
-            getPillarModel().verifyChecksumAlgorithm(request.getChecksumDataForExistingFile().getChecksumSpec(), 
-                    request.getCollectionID());
-        } else if(getSettings().getRepositorySettings().getProtocolSettings()
+        getPillarModel().verifyChecksumAlgorithm(request.getChecksumRequestForExistingFile());
+        if (request.getChecksumDataForExistingFile() != null) {
+            getPillarModel().verifyChecksumAlgorithm(request.getChecksumDataForExistingFile().getChecksumSpec());
+        } else if (getSettings().getRepositorySettings().getProtocolSettings()
                 .isRequireChecksumForDestructiveRequests()) {
             throw new IllegalOperationException(ResponseCode.EXISTING_FILE_CHECKSUM_FAILURE, "No mandatory checksum "
                     + "for destructive operation was supplied.", request.getFileID());
         }
-        
+
         validateFileIDFormat(request.getFileID());
 
         // Validate, that we have the requested file.
-        if(!getPillarModel().hasFileID(request.getFileID(), request.getCollectionID())) {
+        if (!getPillarModel().hasFileID(request.getFileID(), request.getCollectionID())) {
             throw new InvalidMessageException(ResponseCode.FILE_NOT_FOUND_FAILURE, "File not found.");
         }
-        
+
         // calculate and validate the checksum of the file.
         ChecksumDataForFileTYPE checksumData = request.getChecksumDataForExistingFile();
-        if(checksumData != null) {
+        if (checksumData != null) {
             ChecksumSpecTYPE checksumType = checksumData.getChecksumSpec();
 
-            String calculatedChecksum = getPillarModel().getChecksumForFile(request.getFileID(), 
+            String calculatedChecksum = getPillarModel().getChecksumForFile(request.getFileID(),
                     request.getCollectionID(), checksumType);
             String requestedChecksum = Base16Utils.decodeBase16(checksumData.getChecksumValue());
-            if(!calculatedChecksum.equals(requestedChecksum)) {
+            if (!calculatedChecksum.equals(requestedChecksum)) {
                 // Log the different checksums, but do not send the right checksum back!
                 log.warn("Failed to handle delete operation on file '" + request.getFileID() + "' since the request "
-                        + "had the checksum '" + requestedChecksum + "' where our local file has the value '" 
+                        + "had the checksum '" + requestedChecksum + "' where our local file has the value '"
                         + calculatedChecksum + "'. Sending alarm and respond failure.");
 
                 throw new IllegalOperationException(ResponseCode.EXISTING_FILE_CHECKSUM_FAILURE, "Cannot delete file "
@@ -113,12 +107,13 @@ protected void validateRequest(DeleteFileRequest request, MessageContext message
             log.debug("No checksum for validation of the existing file before delete the file '" + request.getFileID()
                     + "'");
         }
-        
+
         log.debug(MessageUtils.createMessageIdentifier(request) + "' validated and accepted.");
     }
 
     /**
      * The method for sending a progress response telling, that the operation is about to be performed.
+     *
      * @param request The request for the DeleteFile operation.
      */
     @Override
@@ -131,49 +126,51 @@ protected void sendProgressResponse(DeleteFileRequest request, MessageContext re
 
         dispatchResponse(response, request);
     }
-    
+
     @Override
-    protected void performOperation(DeleteFileRequest request, MessageContext requestContext) 
+    protected void performOperation(DeleteFileRequest request, MessageContext requestContext)
             throws RequestHandlerException {
-        log.info(MessageUtils.createMessageIdentifier(request) + " Deleting file " + request.getFileID() 
+        log.info(MessageUtils.createMessageIdentifier(request) + " Deleting file " + request.getFileID()
                 + " on collection " + request.getCollectionID());
         ChecksumDataForFileTYPE resultingChecksum = calculatedRequestedChecksum(request);
         deleteTheFile(request);
-        getAuditManager().addAuditEvent(request.getCollectionID(), request.getFileID(), request.getFrom(), 
+        getAuditManager().addAuditEvent(request.getCollectionID(), request.getFileID(), request.getFrom(),
                 "Deleting the file.", request.getAuditTrailInformation(), FileAction.DELETE_FILE,
                 request.getCorrelationID(), requestContext.getCertificateFingerprint());
         sendFinalResponse(request, resultingChecksum);
     }
 
     /**
-     * Method for calculating the requested checksum. 
+     * Method for calculating the requested checksum.
      * If no checksum is requested to be delivered back a warning is logged.
+     *
      * @param message The request for deleting the file. Contains the specs for calculating the checksum.
      * @return The requested checksum, or null if no such checksum is requested.
      * @throws RequestHandlerException If the requested checksum specification is not supported.
      */
-    private ChecksumDataForFileTYPE calculatedRequestedChecksum(DeleteFileRequest message) 
+    private ChecksumDataForFileTYPE calculatedRequestedChecksum(DeleteFileRequest message)
             throws RequestHandlerException {
         ChecksumSpecTYPE checksumType = message.getChecksumRequestForExistingFile();
-        if(checksumType == null) {
+        if (checksumType == null) {
             return null;
         }
 
         return getPillarModel().getChecksumDataForFile(message.getFileID(), message.getCollectionID(), checksumType);
     }
-    
+
     /**
      * Performs the operation of deleting the file from the archive.
+     *
      * @param message The message requesting the file to be deleted.
      */
-    private void deleteTheFile(DeleteFileRequest message) 
-            throws RequestHandlerException {
+    private void deleteTheFile(DeleteFileRequest message) {
         getPillarModel().deleteFile(message.getFileID(), message.getCollectionID());
     }
 
     /**
      * Method for sending the final response.
-     * @param request The request to respond to.
+     *
+     * @param request           The request to respond to.
      * @param requestedChecksum The results of the requested checksums
      */
     private void sendFinalResponse(DeleteFileRequest request, ChecksumDataForFileTYPE requestedChecksum) {
@@ -185,12 +182,12 @@ private void sendFinalResponse(DeleteFileRequest request, ChecksumDataForFileTYP
 
         dispatchResponse(response, request);
     }
-    
+
     /**
-     * Creates a DeleteFileProgressResponse based on a DeleteFileRequest. Missing the 
+     * Creates a DeleteFileProgressResponse based on a DeleteFileRequest. Missing the
      * following fields:
      * <br/> - ResponseInfo
-     * 
+     *
      * @param request The DeleteFileRequest to base the progress response on.
      * @return The DeleteFileProgressResponse based on the request.
      */
@@ -198,16 +195,16 @@ private DeleteFileProgressResponse createDeleteFileProgressResponse(DeleteFileRe
         DeleteFileProgressResponse res = new DeleteFileProgressResponse();
         res.setFileID(request.getFileID());
         res.setPillarID(getPillarModel().getPillarID());
-        
+
         return res;
     }
-    
+
     /**
-     * Creates a DeleteFileFinalResponse based on a DeleteFileRequest. Missing the 
+     * Creates a DeleteFileFinalResponse based on a DeleteFileRequest. Missing the
      * following fields:
      * <br/> - ResponseInfo
      * <br/> - ChecksumDataForFile
-     * 
+     *
      * @param msg The DeleteFileRequest to base the final response on.
      * @return The DeleteFileFinalResponse based on the request.
      */
diff --git a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/GetChecksumsRequestHandler.java b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/GetChecksumsRequestHandler.java
index 1f78a9dbd..78064bfae 100644
--- a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/GetChecksumsRequestHandler.java
+++ b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/GetChecksumsRequestHandler.java
@@ -8,35 +8,22 @@
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.pillar.messagehandler;
 
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.util.Date;
-
-import javax.xml.bind.JAXBException;
-
 import org.apache.activemq.util.ByteArrayInputStream;
 import org.bitrepository.bitrepositorydata.GetChecksumsResults;
 import org.bitrepository.bitrepositoryelements.ChecksumDataForChecksumSpecTYPE;
@@ -59,16 +46,24 @@
 import org.slf4j.LoggerFactory;
 import org.xml.sax.SAXException;
 
-/**
- * Class for performing the GetChecksums operation for this pillar.
- */
+import javax.xml.bind.JAXBException;
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.util.Date;
+
 public class GetChecksumsRequestHandler extends PerformRequestHandler<GetChecksumsRequest> {
-    /** The log.*/
-    private Logger log = LoggerFactory.getLogger(getClass());
+    private final Logger log = LoggerFactory.getLogger(getClass());
 
     /**
      * @param context The context for the message handling.
-     * @param model The storage model for the pillar.
+     * @param model   The storage model for the pillar.
      */
     protected GetChecksumsRequestHandler(MessageHandlerContext context, StorageModel model) {
         super(context, model);
@@ -85,12 +80,11 @@ public MessageResponse generateFailedResponse(GetChecksumsRequest request) {
     }
 
     @Override
-    protected void validateRequest(GetChecksumsRequest request, MessageContext requestContext) 
+    protected void validateRequest(GetChecksumsRequest request, MessageContext requestContext)
             throws RequestHandlerException {
         validateCollectionID(request);
         validatePillarId(request.getPillarID());
-        getPillarModel().verifyChecksumAlgorithm(request.getChecksumRequestForExistingFile(), 
-                request.getCollectionID());
+        getPillarModel().verifyChecksumAlgorithm(request.getChecksumRequestForExistingFile());
         if (request.getFileIDs() != null && request.getFileIDs().getFileID() != null) {
             validateFileIDFormat(request.getFileIDs().getFileID());
             verifyFileIDExistence(request.getFileIDs(), request.getCollectionID());
@@ -112,13 +106,13 @@ protected void sendProgressResponse(GetChecksumsRequest request, MessageContext
     }
 
     @Override
-    protected void performOperation(GetChecksumsRequest request, MessageContext requestContext) 
+    protected void performOperation(GetChecksumsRequest request, MessageContext requestContext)
             throws RequestHandlerException {
-        log.debug(MessageUtils.createMessageIdentifier(request) + " Performing GetChecksums for file(s) " 
+        log.debug(MessageUtils.createMessageIdentifier(request) + " Performing GetChecksums for file(s) "
                 + request.getFileIDs() + " on collection " + request.getCollectionID());
         ExtractedChecksumResultSet extractedChecksums = extractChecksumResults(request);
         ResultingChecksums checksumResults;
-        if(request.getResultAddress() == null) {
+        if (request.getResultAddress() == null) {
             checksumResults = compileResultsForMessage(extractedChecksums);
         } else {
             checksumResults = createAndUploadResults(request, extractedChecksums);
@@ -128,38 +122,39 @@ protected void performOperation(GetChecksumsRequest request, MessageContext requ
 
     /**
      * Method for calculating the checksum results requested.
+     *
      * @param request The message with the checksum request.
      * @return The extracted results for the requested checksum.
      * @throws RequestHandlerException If the requested checksum specification is not supported.
      */
-    private ExtractedChecksumResultSet extractChecksumResults(GetChecksumsRequest request) 
+    private ExtractedChecksumResultSet extractChecksumResults(GetChecksumsRequest request)
             throws RequestHandlerException {
         log.debug("Starting to extracting the checksum of the requested files.");
 
-        if(request.getFileIDs().isSetFileID()) {
-            return getPillarModel().getSingleChecksumResultSet(request.getFileIDs().getFileID(), 
-                    request.getCollectionID(), request.getMinTimestamp(), request.getMaxTimestamp(), 
+        if (request.getFileIDs().isSetFileID()) {
+            return getPillarModel().getSingleChecksumResultSet(request.getFileIDs().getFileID(),
+                    request.getCollectionID(), request.getMinTimestamp(), request.getMaxTimestamp(),
                     request.getChecksumRequestForExistingFile());
         } else {
             Long maxResults = null;
-            if(request.getMaxNumberOfResults() != null) {
+            if (request.getMaxNumberOfResults() != null) {
                 maxResults = request.getMaxNumberOfResults().longValue();
             }
-            return getPillarModel().getChecksumResultSet(request.getMinTimestamp(), request.getMaxTimestamp(), 
+            return getPillarModel().getChecksumResultSet(request.getMinTimestamp(), request.getMaxTimestamp(),
                     maxResults, request.getCollectionID(), request.getChecksumRequestForExistingFile());
         }
     }
 
     /**
-     * Uploads the extracted checksum results to the given URL, and creates the ResultingChecksums object for 
+     * Uploads the extracted checksum results to the given URL, and creates the ResultingChecksums object for
      * the final response message.
-     * 
-     * @param request The message requesting the calculation of the checksums.
+     *
+     * @param request           The message requesting the calculation of the checksums.
      * @param checksumResultSet List containing the requested checksums.
      * @return The ResultingChecksums containing the URL.
      */
-    private ResultingChecksums createAndUploadResults(GetChecksumsRequest request, 
-            ExtractedChecksumResultSet checksumResultSet) throws RequestHandlerException {
+    private ResultingChecksums createAndUploadResults(GetChecksumsRequest request,
+                                                      ExtractedChecksumResultSet checksumResultSet) throws RequestHandlerException {
         ResultingChecksums res = new ResultingChecksums();
 
         String url = request.getResultAddress();
@@ -174,16 +169,17 @@ private ResultingChecksums createAndUploadResults(GetChecksumsRequest request,
         res.setResultAddress(url);
         return res;
     }
-    
+
     /**
      * Compiles the extracted checksum results into the message format.
+     *
      * @param checksumResultSet The checksum results extracted from the database.
      * @return The extracted results in the ResultingChecksums format.
      */
     private ResultingChecksums compileResultsForMessage(ExtractedChecksumResultSet checksumResultSet) {
         ResultingChecksums res = new ResultingChecksums();
-        
-        for(ChecksumDataForChecksumSpecTYPE cs : checksumResultSet.getEntries()) {
+
+        for (ChecksumDataForChecksumSpecTYPE cs : checksumResultSet.getEntries()) {
             res.getChecksumDataItems().add(cs);
         }
 
@@ -192,16 +188,16 @@ private ResultingChecksums compileResultsForMessage(ExtractedChecksumResultSet c
 
     /**
      * Method for creating a file containing the list of calculated checksums.
-     * 
-     * @param request The GetChecksumMessage requesting the checksum calculations.
+     *
+     * @param request           The GetChecksumMessage requesting the checksum calculations.
      * @param checksumResultSet The list of checksums to put into the list.
      * @return A file containing all the checksums in the list.
-     * @throws IOException If something goes wrong in the upload.
+     * @throws IOException   If something goes wrong in the upload.
      * @throws JAXBException If the resulting structure cannot be serialized.
-     * @throws SAXException If the results does not validate against the XSD.
+     * @throws SAXException  If the results does not validate against the XSD.
      */
     private File makeTemporaryChecksumFile(GetChecksumsRequest request,
-            ExtractedChecksumResultSet checksumResultSet) throws IOException, JAXBException, SAXException {
+                                           ExtractedChecksumResultSet checksumResultSet) throws IOException, JAXBException, SAXException {
         // Create the temporary file.
         File checksumResultFile = File.createTempFile(request.getCorrelationID(), new Date().getTime() + ".cs");
         log.debug("Writing the list of checksums to the file '" + checksumResultFile + "'");
@@ -212,23 +208,17 @@ private File makeTemporaryChecksumFile(GetChecksumsRequest request,
         results.setMinVersion(MIN_VERSION);
         results.setPillarID(getSettings().getReferenceSettings().getPillarSettings().getPillarID());
         results.setCollectionID(request.getCollectionID());
-        for(ChecksumDataForChecksumSpecTYPE cs : checksumResultSet.getEntries()) {
+        for (ChecksumDataForChecksumSpecTYPE cs : checksumResultSet.getEntries()) {
             results.getChecksumDataItems().add(cs);
         }
 
         // Print all the checksums safely (close the streams!)
-        OutputStream is = null;
-        try {
-            is = new FileOutputStream(checksumResultFile);
+        try (OutputStream is = new FileOutputStream(checksumResultFile)) {
             JaxbHelper jaxb = new JaxbHelper(XSD_CLASSPATH, XSD_BR_DATA);
             String xmlMessage = jaxb.serializeToXml(results);
             jaxb.validate(new ByteArrayInputStream(xmlMessage.getBytes(StandardCharsets.UTF_8)));
             is.write(xmlMessage.getBytes(StandardCharsets.UTF_8));
             is.flush();
-        } finally {
-            if(is != null) {
-                is.close();
-            }
         }
 
         return checksumResultFile;
@@ -236,10 +226,10 @@ private File makeTemporaryChecksumFile(GetChecksumsRequest request,
 
     /**
      * Method for uploading a file to a given URL.
-     * 
+     *
      * @param fileToUpload The File to upload.
-     * @param url The location where the file should be uploaded.
-     * @throws Exception If something goes wrong.
+     * @param url          The location where the file should be uploaded.
+     * @throws IOException If something goes wrong.
      */
     private void uploadFile(File fileToUpload, String url) throws IOException {
         URL uploadUrl = new URL(url);
@@ -253,12 +243,13 @@ private void uploadFile(File fileToUpload, String url) throws IOException {
 
     /**
      * Method for sending a final response reporting the success.
-     * @param request The GetChecksumRequest to base the response upon.
-     * @param results The results of the checksum calculations.
+     *
+     * @param request        The GetChecksumRequest to base the response upon.
+     * @param results        The results of the checksum calculations.
      * @param hasMoreEntries Whether more results can be found.
      */
-    private void sendFinalResponse(GetChecksumsRequest request, ResultingChecksums results, 
-            boolean hasMoreEntries) {
+    private void sendFinalResponse(GetChecksumsRequest request, ResultingChecksums results,
+                                   boolean hasMoreEntries) {
         GetChecksumsFinalResponse response = createFinalResponse(request);
 
         ResponseInfo fri = new ResponseInfo();
@@ -274,7 +265,7 @@ private void sendFinalResponse(GetChecksumsRequest request, ResultingChecksums r
      * Method for creating a GetChecksumProgressResponse based on a request.
      * Missing arguments:
      * <br/> AuditTrailInformation
-     * 
+     *
      * @param message The GetChecksumsRequest to base the results upon.
      * @return The GetChecksumsProgressResponse based on the GetChecksumsRequest.
      */
@@ -294,7 +285,7 @@ private GetChecksumsProgressResponse createProgressResponse(GetChecksumsRequest
      * <br/> - AuditTrailInformation
      * <br/> - FinalResponseInfo
      * <br/> - ResultingChecksums
-     * 
+     *
      * @param message The message to base the response upon and respond to.
      * @return The response for the generic GetChecksumRequest.
      */
diff --git a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/GetFileIDsRequestHandler.java b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/GetFileIDsRequestHandler.java
index c3d635936..e4f94a46d 100644
--- a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/GetFileIDsRequestHandler.java
+++ b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/GetFileIDsRequestHandler.java
@@ -3,40 +3,28 @@
  * bitrepository-access-client
  * *
  * $Id: GetFileIDsRequestHandler.java 685 2012-01-06 16:35:17Z jolf $
- * $HeadURL: https://sbforge.org/svn/bitrepository/bitrepository-reference/trunk/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/GetFileIDsRequestHandler.java $
+ * $HeadURL: https://sbforge.org/svn/bitrepository/bitrepository-reference/trunk/bitrepository-reference-pillar/src/main/java/org
+ * /bitrepository/pillar/messagehandler/GetFileIDsRequestHandler.java $
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.pillar.messagehandler;
 
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.util.Date;
-
-import javax.xml.bind.JAXBException;
-
 import org.apache.activemq.util.ByteArrayInputStream;
 import org.bitrepository.bitrepositorydata.GetFileIDsResults;
 import org.bitrepository.bitrepositoryelements.FileIDsData;
@@ -59,21 +47,29 @@
 import org.slf4j.LoggerFactory;
 import org.xml.sax.SAXException;
 
-/**
- * Class for handling requests for the GetFileIDs operation.
- */
+import javax.xml.bind.JAXBException;
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.util.Date;
+
 public class GetFileIDsRequestHandler extends PerformRequestHandler<GetFileIDsRequest> {
-    /** The log.*/
-    private Logger log = LoggerFactory.getLogger(getClass());
+    private final Logger log = LoggerFactory.getLogger(getClass());
 
     /**
      * @param context The context for the message handling.
-     * @param model The storage model for the pillar.
+     * @param model   The storage model for the pillar.
      */
     protected GetFileIDsRequestHandler(MessageHandlerContext context, StorageModel model) {
         super(context, model);
     }
-    
+
     @Override
     public Class<GetFileIDsRequest> getRequestClass() {
         return GetFileIDsRequest.class;
@@ -85,7 +81,7 @@ public MessageResponse generateFailedResponse(GetFileIDsRequest request) {
     }
 
     @Override
-    protected void validateRequest(GetFileIDsRequest request, MessageContext requestContext) 
+    protected void validateRequest(GetFileIDsRequest request, MessageContext requestContext)
             throws RequestHandlerException {
         validateCollectionID(request);
         validatePillarId(request.getPillarID());
@@ -100,7 +96,7 @@ protected void validateRequest(GetFileIDsRequest request, MessageContext request
     @Override
     protected void sendProgressResponse(GetFileIDsRequest request, MessageContext requestContext) {
         GetFileIDsProgressResponse response = createProgressResponse(request);
-        
+
         ResponseInfo prInfo = new ResponseInfo();
         prInfo.setResponseCode(ResponseCode.OPERATION_ACCEPTED_PROGRESS);
         prInfo.setResponseText("Starting to locate files.");
@@ -110,13 +106,13 @@ protected void sendProgressResponse(GetFileIDsRequest request, MessageContext re
     }
 
     @Override
-    protected void performOperation(GetFileIDsRequest request, MessageContext requestContext) 
+    protected void performOperation(GetFileIDsRequest request, MessageContext requestContext)
             throws RequestHandlerException {
-        log.debug(MessageUtils.createMessageIdentifier(request) + " Performing GetFileIDs for file(s) " 
+        log.debug(MessageUtils.createMessageIdentifier(request) + " Performing GetFileIDs for file(s) "
                 + request.getFileIDs() + " on collection " + request.getCollectionID());
         ExtractedFileIDsResultSet extractedFileIDs = retrieveFileIDsData(request);
         ResultingFileIDs results = new ResultingFileIDs();
-        if(request.getResultAddress() == null) {
+        if (request.getResultAddress() == null) {
             results.setFileIDsData(extractedFileIDs.getEntries());
         } else {
             uploadResults(request, extractedFileIDs);
@@ -124,30 +120,30 @@ protected void performOperation(GetFileIDsRequest request, MessageContext reques
         }
         sendFinalResponse(request, results, extractedFileIDs);
     }
-    
+
     /**
      * Retrieves the requested FileIDs. Depending on which operation is requested, it will call the appropriate method.
-     * 
+     *
      * @param message The requested for extracting the file ids.
      * @return The resulting collection of FileIDs found.
      */
     private ExtractedFileIDsResultSet retrieveFileIDsData(GetFileIDsRequest message) {
         Long maxResults = null;
-        if(message.getMaxNumberOfResults() != null) {
+        if (message.getMaxNumberOfResults() != null) {
             maxResults = message.getMaxNumberOfResults().longValue();
         }
-        return getPillarModel().getFileIDsResultSet(message.getFileIDs().getFileID(), message.getMinTimestamp(), 
+        return getPillarModel().getFileIDsResultSet(message.getFileIDs().getFileID(), message.getMinTimestamp(),
                 message.getMaxTimestamp(), maxResults, message.getCollectionID());
     }
-    
+
     /**
      * Uploads the results to the URL in the request.
-     *  
-     * @param request The request.
+     *
+     * @param request          The request.
      * @param extractedFileIDs The extracted file ids.
-     * @throws RequestHandlerException If the file with the resutls could not be created, or could not be uploaded.
+     * @throws RequestHandlerException If the file with the results could not be created, or could not be uploaded.
      */
-    private void uploadResults(GetFileIDsRequest request,  ExtractedFileIDsResultSet extractedFileIDs) 
+    private void uploadResults(GetFileIDsRequest request, ExtractedFileIDsResultSet extractedFileIDs)
             throws RequestHandlerException {
         String resultingAddress = request.getResultAddress();
         try {
@@ -157,33 +153,31 @@ private void uploadResults(GetFileIDsRequest request,  ExtractedFileIDsResultSet
             throw new InvalidMessageException(ResponseCode.FILE_TRANSFER_FAILURE, "Could not deliver results.", e);
         }
     }
-    
+
     /**
      * Method for creating a file containing the resulting list of file ids.
-     * 
+     *
      * @param request The GetFileIDsMessage requesting the checksum calculations.
      * @param fileIDs The file ids to be put into the result file.
      * @return A file containing all the checksums in the list.
-     * @throws IOException If a problem occurs during accessing or handling the data.
+     * @throws IOException   If a problem occurs during accessing or handling the data.
      * @throws JAXBException If the resulting structure cannot be serialized or if it is invalid.
      */
     private File makeTemporaryResultFile(GetFileIDsRequest request, FileIDsData fileIDs)
             throws IOException, JAXBException {
         // Create the temporary file.
         File checksumResultFile = File.createTempFile(request.getCorrelationID(), new Date().getTime() + ".id");
-        log.info("Writing the requested fileids to the file '" + checksumResultFile + "'");
+        log.info("Writing the requested fileIDs to the file '" + checksumResultFile + "'");
 
         // Print all the file ids data safely (close the streams!)
-        OutputStream is = null;
-        try {
-            is = new FileOutputStream(checksumResultFile);
+        try (OutputStream is = new FileOutputStream(checksumResultFile)) {
             GetFileIDsResults result = new GetFileIDsResults();
             result.setCollectionID(request.getCollectionID());
             result.setMinVersion(MIN_VERSION);
             result.setVersion(VERSION);
             result.setPillarID(getSettings().getReferenceSettings().getPillarSettings().getPillarID());
             result.setFileIDsData(fileIDs);
-            
+
             JaxbHelper jaxbHelper = new JaxbHelper(XSD_CLASSPATH, XSD_BR_DATA);
             String file = jaxbHelper.serializeToXml(result);
             try {
@@ -196,21 +190,17 @@ private File makeTemporaryResultFile(GetFileIDsRequest request, FileIDsData file
             }
             is.write(file.getBytes(StandardCharsets.UTF_8));
             is.flush();
-        } finally {
-            if(is != null) {
-                is.close();
-            }
         }
-        
+
         return checksumResultFile;
     }
-    
+
     /**
      * Method for uploading a file to a given URL.
-     * 
+     *
      * @param fileToUpload The File to upload.
-     * @param url The location where the file should be uploaded.
-     * @throws Exception If something goes wrong.
+     * @param url          The location where the file should be uploaded.
+     * @throws IOException If something goes wrong.
      */
     private void uploadFile(File fileToUpload, String url) throws IOException {
         URL uploadUrl = new URL(url);
@@ -220,18 +210,19 @@ private void uploadFile(File fileToUpload, String url) throws IOException {
             context.getFileExchange().putFile(in, uploadUrl);
         }
     }
-    
+
     /**
      * Send a positive final response telling that the operation has successfully finished.
-     * @param request The request to base the final response upon.
-     * @param results The results to be put into the final response.
+     *
+     * @param request          The request to base the final response upon.
+     * @param results          The results to be put into the final response.
      * @param extractedFileIDs The extracted file ids. Contains whether more results can be found.
      */
-    private void sendFinalResponse(GetFileIDsRequest request, ResultingFileIDs results, 
-            ExtractedFileIDsResultSet extractedFileIDs) {
+    private void sendFinalResponse(GetFileIDsRequest request, ResultingFileIDs results,
+                                   ExtractedFileIDsResultSet extractedFileIDs) {
         GetFileIDsFinalResponse response = createFinalResponse(request);
 
-        if(extractedFileIDs.hasMoreEntries()) {
+        if (extractedFileIDs.hasMoreEntries()) {
             response.setPartialResult(true);
         }
 
@@ -242,12 +233,12 @@ private void sendFinalResponse(GetFileIDsRequest request, ResultingFileIDs resul
 
         getContext().getResponseDispatcher().dispatchResponse(response, request);
     }
-    
+
     /**
      * Create a generic final response message for the GetFileIDs conversation.
      * Missing:
      * <br/> - ProgressResponseInfo
-     * 
+     *
      * @param message The GetFileIDsRequest to base the response upon.
      * @return The GetFileIDsFinalResponse.
      */
@@ -259,13 +250,13 @@ private GetFileIDsProgressResponse createProgressResponse(GetFileIDsRequest mess
 
         return res;
     }
-    
+
     /**
      * Create a generic final response message for the GetFileIDs conversation.
      * Missing:
      * <br/> - FinalResponseInfo
      * <br/> - ResultingFileIDs
-     * 
+     *
      * @param message The GetFileIDsRequest to base the response upon.
      * @return The GetFileIDsFinalResponse.
      */
diff --git a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/GetFileRequestHandler.java b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/GetFileRequestHandler.java
index 24c119cc2..d1ad53fb3 100644
--- a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/GetFileRequestHandler.java
+++ b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/GetFileRequestHandler.java
@@ -8,28 +8,22 @@
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.pillar.messagehandler;
 
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.math.BigInteger;
-import java.net.URL;
-
 import org.bitrepository.bitrepositoryelements.FileAction;
 import org.bitrepository.bitrepositoryelements.FilePart;
 import org.bitrepository.bitrepositoryelements.ResponseCode;
@@ -48,15 +42,18 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/**
- * Class for performing the GetFile operation.
- */
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.math.BigInteger;
+import java.net.URL;
+
 public class GetFileRequestHandler extends PerformRequestHandler<GetFileRequest> {
-    private Logger log = LoggerFactory.getLogger(getClass());
-    
+    private final Logger log = LoggerFactory.getLogger(getClass());
+
     /**
      * @param context The context for the message handling.
-     * @param model The storage model for the pillar.
+     * @param model   The storage model for the pillar.
      */
     protected GetFileRequestHandler(MessageHandlerContext context, StorageModel model) {
         super(context, model);
@@ -73,21 +70,17 @@ public MessageResponse generateFailedResponse(GetFileRequest message) {
     }
 
     @Override
-    protected void validateRequest(GetFileRequest request, MessageContext requestContext) 
-            throws RequestHandlerException {
+    protected void validateRequest(GetFileRequest request, MessageContext requestContext) throws RequestHandlerException {
         validateCollectionID(request);
         validatePillarId(request.getPillarID());
         validateFileIDFormat(request.getFileID());
 
         getPillarModel().verifyFileExists(request.getFileID(), request.getCollectionID());
-
     }
 
     @Override
-    protected void sendProgressResponse(GetFileRequest request, MessageContext requestContext) 
-            throws RequestHandlerException {
-        FileInfo requestedFi = getPillarModel().getFileInfoForActualFile(request.getFileID(), 
-                request.getCollectionID());
+    protected void sendProgressResponse(GetFileRequest request, MessageContext requestContext) throws RequestHandlerException {
+        FileInfo requestedFi = getPillarModel().getFileInfoForActualFile(request.getFileID(), request.getCollectionID());
         GetFileProgressResponse response = createGetFileProgressResponse(request);
 
         response.setFileSize(BigInteger.valueOf(requestedFi.getSize()));
@@ -99,31 +92,29 @@ protected void sendProgressResponse(GetFileRequest request, MessageContext reque
     }
 
     @Override
-    protected void performOperation(GetFileRequest request, MessageContext requestContext) 
-            throws RequestHandlerException {
-        log.info(MessageUtils.createMessageIdentifier(request) + " Performing GetFile for file " 
-                + request.getFileID() + " on collection " + request.getCollectionID());
+    protected void performOperation(GetFileRequest request, MessageContext requestContext) throws RequestHandlerException {
+        log.info(MessageUtils.createMessageIdentifier(request) + " Performing GetFile for file " + request.getFileID() + " on collection " +
+                request.getCollectionID());
         uploadToClient(request);
-        getAuditManager().addAuditEvent(request.getCollectionID(), request.getFileID(), request.getFrom(), 
-                "Failed identifying pillar.", request.getAuditTrailInformation(), FileAction.GET_FILE,
-                request.getCorrelationID(), requestContext.getCertificateFingerprint());
+        getAuditManager().addAuditEvent(request.getCollectionID(), request.getFileID(), request.getFrom(), "Failed identifying pillar.",
+                request.getAuditTrailInformation(), FileAction.GET_FILE, request.getCorrelationID(),
+                requestContext.getCertificateFingerprint());
         sendFinalResponse(request);
     }
 
     /**
      * Method for uploading the file to the requested location.
+     *
      * @param message The message requesting the GetFile operation.
      * @throws InvalidMessageException If the upload of the file fails.
      */
-    protected void uploadToClient(GetFileRequest message) 
-            throws RequestHandlerException {
-        FileInfo requestedFile = getPillarModel().getFileInfoForActualFile(message.getFileID(), 
-                message.getCollectionID());
+    protected void uploadToClient(GetFileRequest message) throws RequestHandlerException {
+        FileInfo requestedFile = getPillarModel().getFileInfoForActualFile(message.getFileID(), message.getCollectionID());
 
         try {
             InputStream is;
-            if(message.getFilePart() == null) {
-                is = requestedFile.getInputstream();
+            if (message.getFilePart() == null) {
+                is = requestedFile.getInputStream();
             } else {
                 is = extractFilePart(requestedFile, message.getFilePart());
             }
@@ -131,15 +122,16 @@ protected void uploadToClient(GetFileRequest message)
             log.info("Uploading file: " + requestedFile.getFileID() + " to " + message.getFileAddress());
             context.getFileExchange().putFile(is, new URL(message.getFileAddress()));
         } catch (IOException e) {
-            log.warn("The file '" + message.getFileID() + "' from collection '" + message.getCollectionID() 
-                    + "' could not be uploaded at '" + message.getFileAddress() + "'");
-            throw new InvalidMessageException(ResponseCode.FILE_TRANSFER_FAILURE, "Could not deliver file to address '" 
-                    + message.getFileAddress() + "'", e);
+            log.warn("The file '" + message.getFileID() + "' from collection '" + message.getCollectionID() +
+                    "' could not be uploaded at '" + message.getFileAddress() + "'");
+            throw new InvalidMessageException(ResponseCode.FILE_TRANSFER_FAILURE,
+                    "Could not deliver file to address '" + message.getFileAddress() + "'", e);
         }
     }
-    
+
     /**
-     * Extracts a given file part 
+     * Extracts a given file part
+     *
      * @param fileInfo The requested file to extract the file part from.
      * @param filePart The defined interval for the file part.
      * @return A InputStream with the requested file part.
@@ -149,23 +141,26 @@ private InputStream extractFilePart(FileInfo fileInfo, FilePart filePart) throws
         int offset = filePart.getPartOffSet().intValue();
         int size = filePart.getPartLength().intValue();
         byte[] partOfFile = new byte[size];
-        InputStream fis  = null;
+        InputStream fis = null;
         try {
             log.debug("Extracting " + size + " bytes with offset " + offset + " from " + fileInfo.getFileID());
-            fis = fileInfo.getInputstream();
-            
-            fis.read(new byte[offset]);
-            fis.read(partOfFile);
+            fis = fileInfo.getInputStream();
+
+            int bytesRead = fis.read(partOfFile, offset, size);
+            if (bytesRead == size) {
+                log.debug("Bytes extracted successfully.");
+            }
         } finally {
-            if(fis != null) {
+            if (fis != null) {
                 fis.close();
             }
         }
         return new ByteArrayInputStream(partOfFile);
     }
-    
+
     /**
      * Method for sending the final response.
+     *
      * @param request The request to respond to.
      */
     protected void sendFinalResponse(GetFileRequest request) {
@@ -176,9 +171,10 @@ protected void sendFinalResponse(GetFileRequest request) {
 
         dispatchResponse(response, request);
     }
-    
+
     /**
-     * Creates a GetFileProgressResponse based on a GetFileRequest. 
+     * Creates a GetFileProgressResponse based on a GetFileRequest.
+     *
      * @param msg The GetFileRequest to base the progress response on.
      * @return The GetFileProgressResponse based on the request.
      */
@@ -191,9 +187,10 @@ private GetFileProgressResponse createGetFileProgressResponse(GetFileRequest msg
 
         return res;
     }
-    
+
     /**
-     * Creates a GetFileFinalResponse based on a GetFileRequest. 
+     * Creates a GetFileFinalResponse based on a GetFileRequest.
+     *
      * @param msg The GetFileRequest to base the final response on.
      * @return The GetFileFinalResponse based on the request.
      */
diff --git a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/IdentifyPillarsForDeleteFileRequestHandler.java b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/IdentifyPillarsForDeleteFileRequestHandler.java
index 35177d2d5..35e28945b 100644
--- a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/IdentifyPillarsForDeleteFileRequestHandler.java
+++ b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/IdentifyPillarsForDeleteFileRequestHandler.java
@@ -1,23 +1,23 @@
 /*
  * #%L
  * Bitrepository Reference Pillar
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -42,14 +42,13 @@
 /**
  * Class for handling the identification of this pillar for the purpose of performing the DeleteFile operation.
  */
-public class IdentifyPillarsForDeleteFileRequestHandler 
+public class IdentifyPillarsForDeleteFileRequestHandler
         extends IdentifyRequestHandler<IdentifyPillarsForDeleteFileRequest> {
-    /** The log.*/
-    private Logger log = LoggerFactory.getLogger(getClass());
+    private final Logger log = LoggerFactory.getLogger(getClass());
 
     /**
      * @param context The context for the message handling.
-     * @param model The storage model for the pillar.
+     * @param model   The storage model for the pillar.
      */
     protected IdentifyPillarsForDeleteFileRequestHandler(MessageHandlerContext context, StorageModel model) {
         super(context, model);
@@ -64,10 +63,10 @@ public Class<IdentifyPillarsForDeleteFileRequest> getRequestClass() {
     public MessageResponse generateFailedResponse(IdentifyPillarsForDeleteFileRequest message) {
         return createFinalResponse(message);
     }
-        
+
 
     @Override
-    protected void validateRequest(IdentifyPillarsForDeleteFileRequest request, MessageContext messageContext) 
+    protected void validateRequest(IdentifyPillarsForDeleteFileRequest request, MessageContext messageContext)
             throws RequestHandlerException {
         validateCollectionID(request);
         validateFileIDFormat(request.getFileID());
@@ -78,9 +77,9 @@ protected void validateRequest(IdentifyPillarsForDeleteFileRequest request, Mess
     protected void sendPositiveResponse(IdentifyPillarsForDeleteFileRequest request, MessageContext messageContext) {
         IdentifyPillarsForDeleteFileResponse response = createFinalResponse(request);
 
-        response.setTimeToDeliver(TimeMeasurementUtils.getTimeMeasurementFromMiliseconds(
-            getSettings().getReferenceSettings().getPillarSettings().getTimeToStartDeliver()));
-        
+        response.setTimeToDeliver(TimeMeasurementUtils.getTimeMeasurementFromMilliseconds(
+                getSettings().getReferenceSettings().getPillarSettings().getTimeToStartDeliver()));
+
         ResponseInfo irInfo = new ResponseInfo();
         irInfo.setResponseCode(ResponseCode.IDENTIFICATION_POSITIVE);
         irInfo.setResponseText(RESPONSE_FOR_POSITIVE_IDENTIFICATION);
@@ -89,27 +88,28 @@ protected void sendPositiveResponse(IdentifyPillarsForDeleteFileRequest request,
         dispatchResponse(response, request);
         log.debug(MessageUtils.createMessageIdentifier(request) + " Identified for performing a DeleteFile operation.");
     }
-    
+
     /**
-     * Validates that the requested files are present in the archive. 
-     * Otherwise an {@link IdentifyContributorException} with the appropriate errorcode is thrown.
-     * @param message The message containing the id of the file. If no file id is given, then a warning is logged, 
-     * but the operation is accepted.
+     * Validates that the requested files are present in the archive.
+     * Otherwise, an {@link IdentifyContributorException} with the appropriate error-code is thrown.
+     *
+     * @param message The message containing the id of the file. If no file id is given, then a warning is logged,
+     *                but the operation is accepted.
      */
-    private void checkThatRequestedFileIsAvailable(IdentifyPillarsForDeleteFileRequest message) 
+    private void checkThatRequestedFileIsAvailable(IdentifyPillarsForDeleteFileRequest message)
             throws RequestHandlerException {
-        if(!getPillarModel().hasFileID(message.getFileID(), message.getCollectionID())) {
+        if (!getPillarModel().hasFileID(message.getFileID(), message.getCollectionID())) {
             throw new IdentifyContributorException(ResponseCode.FILE_NOT_FOUND_FAILURE, "File not found.");
         }
     }
 
     /**
-     * Creates a IdentifyPillarsForDeleteFileResponse based on a 
+     * Creates a IdentifyPillarsForDeleteFileResponse based on a
      * IdentifyPillarsForDeleteFileRequest. The following fields are not inserted:
      * <br/> - TimeToDeliver
      * <br/> - ResponseInfo
      * <br/> - PillarChecksumSpec
-     * 
+     *
      * @param msg The IdentifyPillarsForDeleteFileRequest to base the response on.
      * @return The response to the request.
      */
diff --git a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/IdentifyPillarsForGetChecksumsRequestHandler.java b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/IdentifyPillarsForGetChecksumsRequestHandler.java
index 81f9fc0c6..f84613658 100644
--- a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/IdentifyPillarsForGetChecksumsRequestHandler.java
+++ b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/IdentifyPillarsForGetChecksumsRequestHandler.java
@@ -8,16 +8,16 @@
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -43,19 +43,17 @@
 /**
  * Class for handling the identification of this pillar for the purpose of performing the GetChecksums operation.
  */
-public class IdentifyPillarsForGetChecksumsRequestHandler 
-        extends IdentifyRequestHandler<IdentifyPillarsForGetChecksumsRequest> {
-    /** The log.*/
-    private Logger log = LoggerFactory.getLogger(getClass());
+public class IdentifyPillarsForGetChecksumsRequestHandler extends IdentifyRequestHandler<IdentifyPillarsForGetChecksumsRequest> {
+    private final Logger log = LoggerFactory.getLogger(getClass());
 
     /**
      * @param context The context for the message handling.
-     * @param model The storage model for the pillar.
+     * @param model   The storage model for the pillar.
      */
     protected IdentifyPillarsForGetChecksumsRequestHandler(MessageHandlerContext context, StorageModel model) {
         super(context, model);
     }
-    
+
     @Override
     public Class<IdentifyPillarsForGetChecksumsRequest> getRequestClass() {
         return IdentifyPillarsForGetChecksumsRequest.class;
@@ -65,13 +63,12 @@ public Class<IdentifyPillarsForGetChecksumsRequest> getRequestClass() {
     public MessageResponse generateFailedResponse(IdentifyPillarsForGetChecksumsRequest message) {
         return createFinalResponse(message);
     }
-    
+
     @Override
     protected void validateRequest(IdentifyPillarsForGetChecksumsRequest request, MessageContext messageContext)
             throws RequestHandlerException {
         validateCollectionID(request);
-        getPillarModel().verifyChecksumAlgorithm(request.getChecksumRequestForExistingFile(),
-                request.getCollectionID());
+        getPillarModel().verifyChecksumAlgorithm(request.getChecksumRequestForExistingFile());
         if (request.getFileIDs() != null && request.getFileIDs().getFileID() != null) {
             validateFileIDFormat(request.getFileIDs().getFileID());
             checkThatAllRequestedFilesAreAvailable(request);
@@ -82,41 +79,40 @@ protected void validateRequest(IdentifyPillarsForGetChecksumsRequest request, Me
     protected void sendPositiveResponse(IdentifyPillarsForGetChecksumsRequest request, MessageContext requestContext) {
         IdentifyPillarsForGetChecksumsResponse response = createFinalResponse(request);
 
-        response.setTimeToDeliver(TimeMeasurementUtils.getTimeMeasurementFromMiliseconds(
-            getSettings().getReferenceSettings().getPillarSettings().getTimeToStartDeliver()));
+        response.setTimeToDeliver(TimeMeasurementUtils.getTimeMeasurementFromMilliseconds(
+                getSettings().getReferenceSettings().getPillarSettings().getTimeToStartDeliver()));
 
         ResponseInfo irInfo = new ResponseInfo();
         irInfo.setResponseCode(ResponseCode.IDENTIFICATION_POSITIVE);
         irInfo.setResponseText(RESPONSE_FOR_POSITIVE_IDENTIFICATION);
         response.setResponseInfo(irInfo);
-        
+
         dispatchResponse(response, request);
-        log.debug(MessageUtils.createMessageIdentifier(request) 
-                + " Identified for performing a GetChecksums operation.");
+        log.debug(MessageUtils.createMessageIdentifier(request) + " Identified for performing a GetChecksums operation.");
     }
 
     /**
-     * Validates that all the requested files in the filelist are present. 
-     * Otherwise an {@link IdentifyContributorException} with the appropriate errorcode is thrown.
-     * @param message The message containing the list files. An empty filelist is expected 
-     * when "AllFiles" or the parameter option is used.
+     * Validates that all the requested files in the file-list are present.
+     * Otherwise an {@link IdentifyContributorException} with the appropriate error-code is thrown.
+     *
+     * @param message The message containing the list files. An empty file-list is expected
+     *                when "AllFiles" or the parameter option is used.
      */
-    private void checkThatAllRequestedFilesAreAvailable(IdentifyPillarsForGetChecksumsRequest message) 
-            throws RequestHandlerException {
+    private void checkThatAllRequestedFilesAreAvailable(IdentifyPillarsForGetChecksumsRequest message) throws RequestHandlerException {
         FileIDs fileids = message.getFileIDs();
-        
-        if(fileids.getFileID() != null && !getPillarModel().hasFileID(fileids.getFileID(), message.getCollectionID())) {
+
+        if (fileids.getFileID() != null && !getPillarModel().hasFileID(fileids.getFileID(), message.getCollectionID())) {
             throw new IdentifyContributorException(ResponseCode.FILE_NOT_FOUND_FAILURE, "File not found.");
         }
     }
-    
+
     /**
-     * Creates a IdentifyPillarsForGetChecksumsResponse based on a 
+     * Creates a IdentifyPillarsForGetChecksumsResponse based on a
      * IdentifyPillarsForGetFileRequest. The following fields are not inserted:
      * <br/> - AuditTrailInformation
      * <br/> - ResponseInfo
      * <br/> - PillarChecksumSpec
-     * 
+     *
      * @param msg The IdentifyPillarsForGetFileRequest to base the response on.
      * @return The response to the request.
      */
@@ -126,7 +122,7 @@ private IdentifyPillarsForGetChecksumsResponse createFinalResponse(IdentifyPilla
         res.setChecksumRequestForExistingFile(msg.getChecksumRequestForExistingFile());
         res.setPillarID(getPillarModel().getPillarID());
         res.setPillarChecksumSpec(getPillarModel().getChecksumPillarSpec());
-        
+
         return res;
     }
 }
diff --git a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/IdentifyPillarsForGetFileIDsRequestHandler.java b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/IdentifyPillarsForGetFileIDsRequestHandler.java
index e5856523d..bf2baa53a 100644
--- a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/IdentifyPillarsForGetFileIDsRequestHandler.java
+++ b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/IdentifyPillarsForGetFileIDsRequestHandler.java
@@ -8,16 +8,16 @@
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -41,19 +41,17 @@
 /**
  * Class for handling the identification of this pillar for the purpose of performing the GetFileIDs operation.
  */
-public class IdentifyPillarsForGetFileIDsRequestHandler 
-        extends IdentifyRequestHandler<IdentifyPillarsForGetFileIDsRequest> {
-    /** The log.*/
-    private Logger log = LoggerFactory.getLogger(getClass());
-    
+public class IdentifyPillarsForGetFileIDsRequestHandler extends IdentifyRequestHandler<IdentifyPillarsForGetFileIDsRequest> {
+    private final Logger log = LoggerFactory.getLogger(getClass());
+
     /**
      * @param context The context for the message handling.
-     * @param model The storage model for the pillar.
+     * @param model   The storage model for the pillar.
      */
     protected IdentifyPillarsForGetFileIDsRequestHandler(MessageHandlerContext context, StorageModel model) {
         super(context, model);
     }
-    
+
     @Override
     public Class<IdentifyPillarsForGetFileIDsRequest> getRequestClass() {
         return IdentifyPillarsForGetFileIDsRequest.class;
@@ -63,9 +61,9 @@ public Class<IdentifyPillarsForGetFileIDsRequest> getRequestClass() {
     public MessageResponse generateFailedResponse(IdentifyPillarsForGetFileIDsRequest message) {
         return createFinalResponse(message);
     }
-    
+
     @Override
-    protected void validateRequest(IdentifyPillarsForGetFileIDsRequest request, MessageContext messageContext) 
+    protected void validateRequest(IdentifyPillarsForGetFileIDsRequest request, MessageContext messageContext)
             throws RequestHandlerException {
         validateCollectionID(request);
         if (request.getFileIDs() != null && request.getFileIDs().getFileID() != null) {
@@ -73,13 +71,13 @@ protected void validateRequest(IdentifyPillarsForGetFileIDsRequest request, Mess
             verifyFileIDExistence(request.getFileIDs(), request.getCollectionID());
         }
     }
-    
+
     @Override
     protected void sendPositiveResponse(IdentifyPillarsForGetFileIDsRequest request, MessageContext requestContext) {
         IdentifyPillarsForGetFileIDsResponse response = createFinalResponse(request);
-        response.setTimeToDeliver(TimeMeasurementUtils.getTimeMeasurementFromMiliseconds(
-            getSettings().getReferenceSettings().getPillarSettings().getTimeToStartDeliver()));
-        
+        response.setTimeToDeliver(TimeMeasurementUtils.getTimeMeasurementFromMilliseconds(
+                getSettings().getReferenceSettings().getPillarSettings().getTimeToStartDeliver()));
+
         ResponseInfo irInfo = new ResponseInfo();
         irInfo.setResponseCode(ResponseCode.IDENTIFICATION_POSITIVE);
         irInfo.setResponseText(RESPONSE_FOR_POSITIVE_IDENTIFICATION);
@@ -88,13 +86,13 @@ protected void sendPositiveResponse(IdentifyPillarsForGetFileIDsRequest request,
         dispatchResponse(response, request);
         log.debug(MessageUtils.createMessageIdentifier(request) + " Identified for performing a GetFileIDs operation.");
     }
-    
+
     /**
-     * Creates a IdentifyPillarsForGetFileIDsResponse based on a 
+     * Creates a IdentifyPillarsForGetFileIDsResponse based on a
      * IdentifyPillarsForGetFileIDsRequest. The following fields are not inserted:
      * <br/> - TimeToDeliver
      * <br/> - IdentifyResponseInfo
-     * 
+     *
      * @param msg The IdentifyPillarsForGetFileIDsRequest to base the response on.
      * @return The response to the request.
      */
@@ -102,7 +100,7 @@ private IdentifyPillarsForGetFileIDsResponse createFinalResponse(IdentifyPillars
         IdentifyPillarsForGetFileIDsResponse res = new IdentifyPillarsForGetFileIDsResponse();
         res.setFileIDs(msg.getFileIDs());
         res.setPillarID(getPillarModel().getPillarID());
-        
+
         return res;
     }
 }
diff --git a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/IdentifyPillarsForGetFileRequestHandler.java b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/IdentifyPillarsForGetFileRequestHandler.java
index f218d21ba..870928456 100644
--- a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/IdentifyPillarsForGetFileRequestHandler.java
+++ b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/IdentifyPillarsForGetFileRequestHandler.java
@@ -8,16 +8,16 @@
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -42,19 +42,17 @@
 /**
  * Class for handling the identification of this pillar for the purpose of performing the GetFile operation.
  */
-public class IdentifyPillarsForGetFileRequestHandler 
-        extends IdentifyRequestHandler<IdentifyPillarsForGetFileRequest> {
-    /** The log.*/
-    private Logger log = LoggerFactory.getLogger(getClass());
+public class IdentifyPillarsForGetFileRequestHandler extends IdentifyRequestHandler<IdentifyPillarsForGetFileRequest> {
+    private final Logger log = LoggerFactory.getLogger(getClass());
 
     /**
      * @param context The context for the message handling.
-     * @param model The storage model for the pillar.
+     * @param model   The storage model for the pillar.
      */
     protected IdentifyPillarsForGetFileRequestHandler(MessageHandlerContext context, StorageModel model) {
         super(context, model);
     }
-    
+
     @Override
     public Class<IdentifyPillarsForGetFileRequest> getRequestClass() {
         return IdentifyPillarsForGetFileRequest.class;
@@ -64,18 +62,16 @@ public Class<IdentifyPillarsForGetFileRequest> getRequestClass() {
     public MessageResponse generateFailedResponse(IdentifyPillarsForGetFileRequest message) {
         return createFinalResponse(message);
     }
-    
+
     @Override
-    protected void validateRequest(IdentifyPillarsForGetFileRequest request, MessageContext requestContext) 
-            throws RequestHandlerException {
-        if(getPillarModel().getChecksumPillarSpec() != null) {
-            throw new InvalidMessageException(ResponseCode.REQUEST_NOT_SUPPORTED, "A ChecksumPillar cannot deliver "
-                    + "actual files.");
+    protected void validateRequest(IdentifyPillarsForGetFileRequest request, MessageContext requestContext) throws RequestHandlerException {
+        if (getPillarModel().getChecksumPillarSpec() != null) {
+            throw new InvalidMessageException(ResponseCode.REQUEST_NOT_SUPPORTED, "A ChecksumPillar cannot deliver " + "actual files.");
         }
 
         validateCollectionID(request);
         validateFileIDFormat(request.getFileID());
-        
+
         checkThatFileIsAvailable(request);
     }
 
@@ -83,9 +79,9 @@ protected void validateRequest(IdentifyPillarsForGetFileRequest request, Message
     protected void sendPositiveResponse(IdentifyPillarsForGetFileRequest request, MessageContext requestContext) {
         IdentifyPillarsForGetFileResponse response = createFinalResponse(request);
 
-        response.setTimeToDeliver(TimeMeasurementUtils.getTimeMeasurementFromMiliseconds(
-            getSettings().getReferenceSettings().getPillarSettings().getTimeToStartDeliver()));
-        
+        response.setTimeToDeliver(TimeMeasurementUtils.getTimeMeasurementFromMilliseconds(
+                getSettings().getReferenceSettings().getPillarSettings().getTimeToStartDeliver()));
+
         ResponseInfo irInfo = new ResponseInfo();
         irInfo.setResponseCode(ResponseCode.IDENTIFICATION_POSITIVE);
         irInfo.setResponseText(RESPONSE_FOR_POSITIVE_IDENTIFICATION);
@@ -94,24 +90,24 @@ protected void sendPositiveResponse(IdentifyPillarsForGetFileRequest request, Me
         dispatchResponse(response, request);
         log.debug(MessageUtils.createMessageIdentifier(request) + " Identified for performing a GetFile operation.");
     }
-    
+
     /**
-     * Validates that the requested file is within the archive. 
-     * Otherwise an {@link IdentifyContributorException} with the appropriate errorcode is thrown.
+     * Validates that the requested file is within the archive.
+     *
      * @param message The request for the identification for the GetFileRequest operation.
+     * @throws RequestHandlerException If the file could not be found in the archive.
      */
-    private void checkThatFileIsAvailable(IdentifyPillarsForGetFileRequest message) 
-            throws RequestHandlerException {
+    private void checkThatFileIsAvailable(IdentifyPillarsForGetFileRequest message) throws RequestHandlerException {
         getPillarModel().verifyFileExists(message.getFileID(), message.getCollectionID());
     }
-    
+
     /**
-     * Creates a IdentifyPillarsForGetFileResponse based on a 
+     * Creates a IdentifyPillarsForGetFileResponse based on a
      * IdentifyPillarsForGetFileRequest. The following fields are not inserted:
      * <br/> - TimeToDeliver
      * <br/> - AuditTrailInformation
      * <br/> - IdentifyResponseInfo
-     * 
+     *
      * @param msg The IdentifyPillarsForGetFileRequest to base the response on.
      * @return The response to the request.
      */
@@ -119,7 +115,7 @@ private IdentifyPillarsForGetFileResponse createFinalResponse(IdentifyPillarsFor
         IdentifyPillarsForGetFileResponse res = new IdentifyPillarsForGetFileResponse();
         res.setFileID(msg.getFileID());
         res.setPillarID(getPillarModel().getPillarID());
-        
+
         return res;
     }
 }
diff --git a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/IdentifyPillarsForPutFileRequestHandler.java b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/IdentifyPillarsForPutFileRequestHandler.java
index 64ae518ee..d98a8933c 100644
--- a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/IdentifyPillarsForPutFileRequestHandler.java
+++ b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/IdentifyPillarsForPutFileRequestHandler.java
@@ -8,24 +8,22 @@
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.pillar.messagehandler;
 
-import java.math.BigInteger;
-
 import org.bitrepository.bitrepositoryelements.ResponseCode;
 import org.bitrepository.bitrepositoryelements.ResponseInfo;
 import org.bitrepository.bitrepositorymessages.IdentifyPillarsForPutFileRequest;
@@ -41,117 +39,116 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.math.BigInteger;
+
 /**
  * Class for handling the identification of this pillar for the purpose of performing the PutFile operation.
  */
-public class IdentifyPillarsForPutFileRequestHandler 
-        extends IdentifyRequestHandler<IdentifyPillarsForPutFileRequest> {
-    /** The log.*/
-    private Logger log = LoggerFactory.getLogger(getClass());
-    
+public class IdentifyPillarsForPutFileRequestHandler extends IdentifyRequestHandler<IdentifyPillarsForPutFileRequest> {
+    private final Logger log = LoggerFactory.getLogger(getClass());
+
     /**
      * @param context The context for the message handling.
-     * @param model The storage model for the pillar.
+     * @param model   The storage model for the pillar.
      */
     protected IdentifyPillarsForPutFileRequestHandler(MessageHandlerContext context, StorageModel model) {
         super(context, model);
     }
-    
+
     @Override
     public Class<IdentifyPillarsForPutFileRequest> getRequestClass() {
         return IdentifyPillarsForPutFileRequest.class;
     }
-    
+
     @Override
     public MessageResponse generateFailedResponse(IdentifyPillarsForPutFileRequest message) {
         return createFinalResponse(message);
     }
-    
+
     @Override
-    public void validateRequest(IdentifyPillarsForPutFileRequest request, MessageContext messageContext) 
-            throws RequestHandlerException {
+    public void validateRequest(IdentifyPillarsForPutFileRequest request, MessageContext messageContext) throws RequestHandlerException {
         validateCollectionID(request);
         validateFileIDFormat(request.getFileID());
     }
-    
+
     @Override
     protected void sendPositiveResponse(IdentifyPillarsForPutFileRequest request, MessageContext requestContext)
-                    throws RequestHandlerException {
-        if(checkThatTheFileDoesNotAlreadyExist(request)) {
+            throws RequestHandlerException {
+        if (checkThatTheFileDoesNotAlreadyExist(request)) {
             respondDuplicateFile(request);
         } else {
             checkSpaceForStoringNewFile(request);
-            respondSuccesfullIdentification(request);
+            respondSuccessfulIdentification(request);
         }
     }
-    
+
     /**
-     * Validates that the file is not already within the archive. 
-     * Otherwise an {@link IdentifyContributorException} with the appropriate errorcode is thrown.
+     * Validates that the file is not already within the archive.
+     *
      * @param message The request with the filename to validate.
      * @return Whether the file already exists.
      */
     private boolean checkThatTheFileDoesNotAlreadyExist(IdentifyPillarsForPutFileRequest message) {
-        if(message.getFileID() == null) {
-            log.debug("No fileid given in the identification request.");
+        if (message.getFileID() == null) {
+            log.debug("No fileID given in the identification request.");
             return false;
         }
-        
+
         return getPillarModel().hasFileID(message.getFileID(), message.getCollectionID());
     }
-    
+
     /**
      * Validates that enough space exists is left in the archive.
-     * Otherwise an {@link IdentifyContributorException} with the appropriate errorcode is thrown.
+     *
      * @param message The request with the size of the file.
+     * @throws RequestHandlerException If there is not enough space free to store the file.
      */
-    private void checkSpaceForStoringNewFile(IdentifyPillarsForPutFileRequest message) 
-            throws RequestHandlerException {
+    private void checkSpaceForStoringNewFile(IdentifyPillarsForPutFileRequest message) throws RequestHandlerException {
         BigInteger fileSize = message.getFileSize();
-        if(fileSize == null) {
-            log.debug("No file size given in the identification request. "
-                    + "Validating that the archive has any space left.");
+        if (fileSize == null) {
+            log.debug("No file size given in the identification request. " + "Validating that the archive has any space left.");
             fileSize = BigInteger.ZERO;
         }
-        
+
         getPillarModel().verifyEnoughFreeSpaceLeftForFile(fileSize.longValue(), message.getCollectionID());
     }
-    
+
     /**
      * Method for sending a response for 'DUPLICATE_FILE_FAILURE'.
+     *
      * @param message The request to base the response upon.
-     * @throws RequestHandlerException 
+     * @throws RequestHandlerException If the checksum of the file from the request could not be verified.
      */
     private void respondDuplicateFile(IdentifyPillarsForPutFileRequest message) throws RequestHandlerException {
         IdentifyPillarsForPutFileResponse response = createFinalResponse(message);
 
         response.setReplyTo(getSettings().getReceiverDestinationID());
-        response.setTimeToDeliver(TimeMeasurementUtils.getTimeMeasurementFromMiliseconds(
-            getSettings().getReferenceSettings().getPillarSettings().getTimeToStartDeliver()));
-        response.setChecksumDataForExistingFile(getPillarModel().getChecksumDataForFile(message.getFileID(),
-                message.getCollectionID(), ChecksumUtils.getDefault(getSettings())));
-        
+        response.setTimeToDeliver(TimeMeasurementUtils.getTimeMeasurementFromMilliseconds(
+                getSettings().getReferenceSettings().getPillarSettings().getTimeToStartDeliver()));
+        response.setChecksumDataForExistingFile(getPillarModel().getChecksumDataForFile(message.getFileID(), message.getCollectionID(),
+                ChecksumUtils.getDefault(getSettings())));
+
         ResponseInfo irInfo = new ResponseInfo();
         irInfo.setResponseCode(ResponseCode.DUPLICATE_FILE_FAILURE);
         response.setResponseInfo(irInfo);
 
         dispatchResponse(response, message);
-        log.debug(MessageUtils.createMessageIdentifier(message) 
-                + " Duplicate file identification for PutFile operation");
+        log.debug(MessageUtils.createMessageIdentifier(message) + " Duplicate file identification for PutFile operation");
     }
-    
+
     /**
      * Method for sending a positive response for putting this file.
+     *
      * @param request The request to respond to.
      */
-    private void respondSuccesfullIdentification(IdentifyPillarsForPutFileRequest request)  {
+    private void respondSuccessfulIdentification(IdentifyPillarsForPutFileRequest request) {
         IdentifyPillarsForPutFileResponse response = createFinalResponse(request);
 
         // Needs to filled in: AuditTrailInformation, PillarChecksumSpec, ReplyTo, TimeToDeliver
         response.setReplyTo(getSettings().getContributorDestinationID());
-        response.setTimeToDeliver(TimeMeasurementUtils.getTimeMeasurementFromMiliseconds(
-            getSettings().getReferenceSettings().getPillarSettings().getTimeToStartDeliver()));
-        
+        response.setTimeToDeliver(TimeMeasurementUtils.getTimeMeasurementFromMilliseconds(
+                getSettings().getReferenceSettings().getPillarSettings().getTimeToStartDeliver()));
+
         ResponseInfo irInfo = new ResponseInfo();
         irInfo.setResponseCode(ResponseCode.IDENTIFICATION_POSITIVE);
         irInfo.setResponseText(RESPONSE_FOR_POSITIVE_IDENTIFICATION);
@@ -160,15 +157,15 @@ private void respondSuccesfullIdentification(IdentifyPillarsForPutFileRequest re
         dispatchResponse(response, request);
         log.debug(MessageUtils.createMessageIdentifier(request) + " Identified for performing a PutFile operation.");
     }
-    
+
     /**
-     * Creates a IdentifyPillarsForPutFileResponse based on a 
+     * Creates a IdentifyPillarsForPutFileResponse based on a
      * IdentifyPillarsForPutFileRequest. The following fields are not inserted:
      * <br/> - TimeToDeliver
      * <br/> - AuditTrailInformation
      * <br/> - PillarChecksumSpec
      * <br/> - IdentifyResponseInfo
-     * 
+     *
      * @param msg The IdentifyPillarsForPutFileRequest to base the response on.
      * @return A IdentifyPillarsForPutFileResponse from the request.
      */
diff --git a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/IdentifyPillarsForReplaceFileRequestHandler.java b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/IdentifyPillarsForReplaceFileRequestHandler.java
index 235f7f487..bea3c6e2b 100644
--- a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/IdentifyPillarsForReplaceFileRequestHandler.java
+++ b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/IdentifyPillarsForReplaceFileRequestHandler.java
@@ -1,31 +1,29 @@
 /*
  * #%L
  * Bitrepository Reference Pillar
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.pillar.messagehandler;
 
-import java.math.BigInteger;
-
 import org.bitrepository.bitrepositoryelements.ResponseCode;
 import org.bitrepository.bitrepositoryelements.ResponseInfo;
 import org.bitrepository.bitrepositorymessages.IdentifyPillarsForReplaceFileRequest;
@@ -41,17 +39,17 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.math.BigInteger;
+
 /**
  * Class for handling the identification of this pillar for the purpose of performing the ReplaceFile operation.
  */
-public class IdentifyPillarsForReplaceFileRequestHandler 
-        extends IdentifyRequestHandler<IdentifyPillarsForReplaceFileRequest> {
-    /** The log.*/
-    private Logger log = LoggerFactory.getLogger(getClass());
+public class IdentifyPillarsForReplaceFileRequestHandler extends IdentifyRequestHandler<IdentifyPillarsForReplaceFileRequest> {
+    private final Logger log = LoggerFactory.getLogger(getClass());
 
     /**
      * @param context The context for the message handling.
-     * @param model The storage model for the pillar.
+     * @param model   The storage model for the pillar.
      */
     protected IdentifyPillarsForReplaceFileRequestHandler(MessageHandlerContext context, StorageModel model) {
         super(context, model);
@@ -66,68 +64,65 @@ public Class<IdentifyPillarsForReplaceFileRequest> getRequestClass() {
     public MessageResponse generateFailedResponse(IdentifyPillarsForReplaceFileRequest message) {
         return createFinalResponse(message);
     }
-    
+
     @Override
-    protected void validateRequest(IdentifyPillarsForReplaceFileRequest request, MessageContext messageContext) 
+    protected void validateRequest(IdentifyPillarsForReplaceFileRequest request, MessageContext messageContext)
             throws RequestHandlerException {
         validateCollectionID(request);
         validateFileIDFormat(request.getFileID());
         checkThatRequestedFileIsAvailable(request);
         checkSpaceForStoringNewFile(request);
     }
-    
+
     @Override
-    protected void sendPositiveResponse(IdentifyPillarsForReplaceFileRequest request,
-            MessageContext requestContext) throws RequestHandlerException {
+    protected void sendPositiveResponse(IdentifyPillarsForReplaceFileRequest request, MessageContext requestContext) {
         IdentifyPillarsForReplaceFileResponse response = createFinalResponse(request);
 
-        response.setTimeToDeliver(TimeMeasurementUtils.getTimeMeasurementFromMiliseconds(
-            getSettings().getReferenceSettings().getPillarSettings().getTimeToStartDeliver()));
-        
+        response.setTimeToDeliver(TimeMeasurementUtils.getTimeMeasurementFromMilliseconds(
+                getSettings().getReferenceSettings().getPillarSettings().getTimeToStartDeliver()));
+
         ResponseInfo irInfo = new ResponseInfo();
         irInfo.setResponseCode(ResponseCode.IDENTIFICATION_POSITIVE);
         irInfo.setResponseText(RESPONSE_FOR_POSITIVE_IDENTIFICATION);
         response.setResponseInfo(irInfo);
 
         dispatchResponse(response, request);
-        log.debug(MessageUtils.createMessageIdentifier(request) 
-                + " Identified for performing a ReplaceFile operation.");
+        log.debug(MessageUtils.createMessageIdentifier(request) + " Identified for performing a ReplaceFile operation.");
     }
 
     /**
-     * Validates that the requested files are present in the archive. 
-     * Otherwise an {@link IdentifyContributorException} with the appropriate error code is thrown.
-     * @param message The message containing the id of the file. 
+     * Validates that the requested files are present in the archive.
+     *
+     * @param message The message containing the id of the file.
+     * @throws IdentifyContributorException If the file is not available, e.g. it doesn't exist.
      */
-    private void checkThatRequestedFileIsAvailable(IdentifyPillarsForReplaceFileRequest message) 
-            throws RequestHandlerException {
-        if(!getPillarModel().hasFileID(message.getFileID(), message.getCollectionID())) {
-            throw new IdentifyContributorException(ResponseCode.FILE_NOT_FOUND_FAILURE, "Could not find the "
-                    + "requested file to delete.");
+    private void checkThatRequestedFileIsAvailable(IdentifyPillarsForReplaceFileRequest message) throws IdentifyContributorException {
+        if (!getPillarModel().hasFileID(message.getFileID(), message.getCollectionID())) {
+            throw new IdentifyContributorException(ResponseCode.FILE_NOT_FOUND_FAILURE,
+                    "Could not find the " + "requested file to delete.");
         }
     }
-    
+
     /**
      * Validates that enough space exists is left in the archive.
-     * Otherwise an {@link IdentifyContributorException} with the appropriate error code is thrown.
+     *
      * @param message The request with the size of the file.
+     * @throws RequestHandlerException If there is not enough space free to store the file.
      */
-    private void checkSpaceForStoringNewFile(IdentifyPillarsForReplaceFileRequest message) 
-            throws RequestHandlerException {
+    private void checkSpaceForStoringNewFile(IdentifyPillarsForReplaceFileRequest message) throws RequestHandlerException {
         BigInteger fileSize = message.getFileSize();
-        if(fileSize == null) {
-            log.debug("No file size given in the identification request. "
-                    + "Validating that the archive has any space left.");
+        if (fileSize == null) {
+            log.debug("No file size given in the identification request. " + "Validating that the archive has any space left.");
             fileSize = BigInteger.ZERO;
         }
-        
+
         getPillarModel().verifyEnoughFreeSpaceLeftForFile(fileSize.longValue(), message.getCollectionID());
     }
-    
+
     /**
-     * Creates a IdentifyPillarsForGetChecksumsResponse based on a 
-     * IdentifyPillarsForReplaceFileRequest. 
-     * 
+     * Creates a IdentifyPillarsForGetChecksumsResponse based on a
+     * IdentifyPillarsForReplaceFileRequest.
+     *
      * @param request The IdentifyPillarsForReplaceFileRequest to base the response on.
      * @return The response to the request.
      */
@@ -136,7 +131,7 @@ private IdentifyPillarsForReplaceFileResponse createFinalResponse(IdentifyPillar
         res.setFileID(request.getFileID());
         res.setPillarID(getPillarModel().getPillarID());
         res.setPillarChecksumSpec(getPillarModel().getChecksumPillarSpec());
-        
+
         return res;
     }
 }
diff --git a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/IdentifyRequestHandler.java b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/IdentifyRequestHandler.java
index 2ae83f6de..e8a1e5f16 100644
--- a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/IdentifyRequestHandler.java
+++ b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/IdentifyRequestHandler.java
@@ -8,12 +8,12 @@
  * it under the terms of the GNU Lesser General Public License as
  * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
@@ -30,14 +30,14 @@
 /**
  * Abstract class for the methods for handing the identify request messages.
  * Contains the common methods for handling identify request messages.
- *  @param <T> The type of identify request message to handle.
+ *
+ * @param <T> The type of identify request message to handle.
  */
 public abstract class IdentifyRequestHandler<T extends MessageRequest> extends PillarMessageHandler<T> {
 
     /**
-     * Constructor.
      * @param context The context for the message handling.
-     * @param model The storage model for the pillar.
+     * @param model   The storage model for the pillar.
      */
     protected IdentifyRequestHandler(MessageHandlerContext context, StorageModel model) {
         super(context, model);
@@ -52,16 +52,18 @@ public void processRequest(T request, MessageContext requestContext)
 
     /**
      * Validate both that the given request it is possible to perform and that it is allowed.
-     * @param request The request to validate.
+     *
+     * @param request        The request to validate.
      * @param requestContext The context for the request.
      * @throws RequestHandlerException If something in the request is inconsistent with the possibilities of the pillar.
      */
     protected abstract void validateRequest(T request, MessageContext requestContext)
             throws RequestHandlerException;
-    
+
     /**
      * Sends a identification response.
-     * @param request The request to respond to.
+     *
+     * @param request        The request to respond to.
      * @param requestContext The context for the request.
      * @throws RequestHandlerException If the positive response could not be created.
      */
diff --git a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/PerformRequestHandler.java b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/PerformRequestHandler.java
index 4898c9b38..0f3118b78 100644
--- a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/PerformRequestHandler.java
+++ b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/PerformRequestHandler.java
@@ -8,12 +8,12 @@
  * it under the terms of the GNU Lesser General Public License as
  * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
@@ -30,14 +30,14 @@
 /**
  * Abstract class for the methods for handing the perform request messages.
  * Contains the common methods for handling perform request messages.
- *  @param <T> The type of perform request message to handle.
+ *
+ * @param <T> The type of perform request message to handle.
  */
 public abstract class PerformRequestHandler<T extends MessageRequest> extends PillarMessageHandler<T> {
 
     /**
-     * Constructor.
      * @param context The context for the message handling.
-     * @param model The storage model for the pillar.
+     * @param model   The storage model for the pillar.
      */
     protected PerformRequestHandler(MessageHandlerContext context, StorageModel model) {
         super(context, model);
@@ -53,25 +53,28 @@ public void processRequest(T request, MessageContext requestContext)
 
     /**
      * Validate both that the given request it is possible to perform and that it is allowed.
-     * @param request The request to validate.
+     *
+     * @param request        The request to validate.
      * @param requestContext The context for the request.
      * @throws RequestHandlerException If something in the request is inconsistent with the possibilities of the pillar.
      */
     protected abstract void validateRequest(T request, MessageContext requestContext)
             throws RequestHandlerException;
-    
+
     /**
      * Sends a progress response.
-     * @param request The request to respond to.
+     *
+     * @param request        The request to respond to.
      * @param requestContext The context for the request.
-     * @throws RequestHandlerException If something data necessary for the progress response could not be extracted. 
+     * @throws RequestHandlerException If something data necessary for the progress response could not be extracted.
      */
     protected abstract void sendProgressResponse(T request, MessageContext requestContext)
             throws RequestHandlerException;
-    
+
     /**
      * Perform the operation behind the request.
-     * @param request The request to perform.
+     *
+     * @param request        The request to perform.
      * @param requestContext The context for the request.
      * @throws RequestHandlerException If the request is unable to be performed.
      */
diff --git a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/PillarMediator.java b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/PillarMediator.java
index 437cabfe1..c95951680 100644
--- a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/PillarMediator.java
+++ b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/PillarMediator.java
@@ -8,25 +8,22 @@
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.pillar.messagehandler;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.bitrepository.bitrepositoryelements.ResponseCode;
 import org.bitrepository.bitrepositoryelements.ResponseInfo;
 import org.bitrepository.bitrepositorymessages.MessageRequest;
@@ -47,23 +44,23 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * This is the abstract instance for delegating the conversations for the pillar.
- * It only responds to requests. It does not it self start conversations, though it might send Alarms when something 
+ * It only responds to requests. It does not it self start conversations, though it might send Alarms when something
  * is not right.
  * All other messages than requests are considered garbage.
  */
 public class PillarMediator extends AbstractContributorMediator {
-    private Logger log = LoggerFactory.getLogger(getClass());
+    private final Logger log = LoggerFactory.getLogger(getClass());
     protected final MessageHandlerContext context;
 
     protected final StorageModel pillarModel;
 
     /**
-     * Constructor.
-     * Sets the parameters of this mediator, and adds itself as a listener to the destinations.
-     *
-     * @param messageBus  The messagebus.
+     * @param messageBus  The message-bus.
      * @param context     The context for the message handlers.
      * @param pillarModel The storage model for the pillar.
      */
@@ -73,7 +70,7 @@ public PillarMediator(MessageBus messageBus, MessageHandlerContext context, Stor
         this.pillarModel = pillarModel;
     }
 
-    @SuppressWarnings({ "unchecked", "rawtypes" })
+    @SuppressWarnings({"unchecked", "rawtypes"})
     @Override
     protected void handleRequest(MessageRequest request, MessageContext messageContext, RequestHandler handler) {
         try {
@@ -94,37 +91,37 @@ protected void handleRequest(MessageRequest request, MessageContext messageConte
             ResponseInfo responseInfo = new ResponseInfo();
             responseInfo.setResponseCode(ResponseCode.FAILURE);
             responseInfo.setResponseText(e.toString());
-            
+
             dispatchNegativeResponse(request, handler, responseInfo);
             getAlarmDispatcher().handleRuntimeExceptions(e);
         }
     }
-    
+
     @SuppressWarnings("rawtypes")
     @Override
     protected RequestHandler[] createListOfHandlers() {
         List<RequestHandler> handlers = new ArrayList<>();
-        
+
         handlers.add(new IdentifyPillarsForGetFileRequestHandler(context, pillarModel));
         handlers.add(new GetFileRequestHandler(context, pillarModel));
         handlers.add(new IdentifyPillarsForGetFileIDsRequestHandler(context, pillarModel));
         handlers.add(new GetFileIDsRequestHandler(context, pillarModel));
         handlers.add(new IdentifyPillarsForGetChecksumsRequestHandler(context, pillarModel));
         handlers.add(new GetChecksumsRequestHandler(context, pillarModel));
-        
+
         handlers.add(new IdentifyContributorsForGetStatusRequestHandler(getContext()));
         handlers.add(new GetStatusRequestHandler(getContext()));
         handlers.add(new IdentifyContributorsForGetAuditTrailsRequestHandler(getContext()));
         handlers.add(new GetAuditTrailsRequestHandler(getContext(), context.getAuditTrailManager()));
-        
+
         handlers.add(new IdentifyPillarsForPutFileRequestHandler(context, pillarModel));
         handlers.add(new PutFileRequestHandler(context, pillarModel));
         handlers.add(new IdentifyPillarsForDeleteFileRequestHandler(context, pillarModel));
         handlers.add(new DeleteFileRequestHandler(context, pillarModel));
         handlers.add(new IdentifyPillarsForReplaceFileRequestHandler(context, pillarModel));
         handlers.add(new ReplaceFileRequestHandler(context, pillarModel));
-        
-        return handlers.toArray(new RequestHandler[handlers.size()]);
+
+        return handlers.toArray(new RequestHandler[0]);
     }
 
     @Override
@@ -136,7 +133,7 @@ protected PillarAlarmDispatcher getAlarmDispatcher() {
         return (PillarAlarmDispatcher) context.getAlarmDispatcher();
     }
 
-    @SuppressWarnings({ "rawtypes", "unchecked" })
+    @SuppressWarnings({"rawtypes", "unchecked"})
     private void dispatchNegativeResponse(MessageRequest request, RequestHandler handler, ResponseInfo info) {
         log.info("Cannot perform operation. Sending failed response. Cause: " + info.getResponseText());
         MessageResponse response = handler.generateFailedResponse(request);
diff --git a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/PillarMessageHandler.java b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/PillarMessageHandler.java
index be84e3871..1ba8e2d5b 100644
--- a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/PillarMessageHandler.java
+++ b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/PillarMessageHandler.java
@@ -8,16 +8,16 @@
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -41,19 +41,14 @@
 
 /**
  * Abstract level for message handling for both types of pillar.
+ *
  * @param <T> The type of request message to handle.
  */
 public abstract class PillarMessageHandler<T extends MessageRequest> extends AbstractRequestHandler<T> {
-    /** The log.*/
-    private Logger log = LoggerFactory.getLogger(getClass());
-    /** The response value for a positive identification.*/
+    private final Logger log = LoggerFactory.getLogger(getClass());
     protected static final String RESPONSE_FOR_POSITIVE_IDENTIFICATION = "Operation acknowledged and accepted.";
-    
-    /** The context for the message handler.*/
     protected final MessageHandlerContext context;
-    /** The file id validator for validating the file id.*/
     private final FileIDValidator fileIDValidator;
-    /** The model for the pillar.*/
     private final StorageModel pillarModel;
 
     /**
@@ -73,69 +68,70 @@ protected PillarMessageHandler(MessageHandlerContext context, StorageModel fileI
     protected StorageModel getPillarModel() {
         return pillarModel;
     }
-    
+
     /**
      * @return The settings for this message handler.
      */
     protected Settings getSettings() {
         return context.getSettings();
     }
-    
+
     /**
      * @return The audit trail manager for this message sender.
      */
     protected AuditTrailManager getAuditManager() {
         return context.getAuditTrailManager();
     }
-    
+
     /**
      * Validates that it is the correct pillar id.
+     *
      * @param pillarID The pillar id.
      */
     protected void validatePillarId(String pillarID) {
-        if(!pillarID.equals(getSettings().getComponentID())) {
-            throw new IllegalArgumentException("The message had a wrong PillarId: "
-                    + "Expected '" + getSettings().getComponentID()
-                    + "' but was '" + pillarID + "'.");
+        if (!pillarID.equals(getSettings().getComponentID())) {
+            throw new IllegalArgumentException(
+                    "The message had a wrong PillarId: " + "Expected '" + getSettings().getComponentID() + "' but was '" + pillarID + "'.");
         }
     }
-    
+
     /**
-     * Verifies that we have a given fileID on a given collection, otherwise throws an exception. 
+     * Verifies that we have a given fileID on a given collection, otherwise throws an exception.
      * If no specific FileID is given (the AllFileIDs), then it is ignored.
-     * @param fileIDs The FileIDs containing the fileID which we should have.  
+     *
+     * @param fileIDs      The FileIDs containing the fileID which we should have.
      * @param collectionID The collection which should contain the requested file.
      * @throws RequestHandlerException If a specific file is given, but we do not have it.
      */
     protected void verifyFileIDExistence(FileIDs fileIDs, String collectionID) throws RequestHandlerException {
-        if(fileIDs.getFileID() == null) {
+        if (fileIDs.getFileID() == null) {
             return;
         }
 
-        if(!getPillarModel().hasFileID(fileIDs.getFileID(), collectionID)) {
-            log.warn("The following file is missing '" + fileIDs.getFileID() + "' at collection '" + collectionID 
-                    + "'.");
+        if (!getPillarModel().hasFileID(fileIDs.getFileID(), collectionID)) {
+            log.warn("The following file is missing '" + fileIDs.getFileID() + "' at collection '" + collectionID + "'.");
             throw new InvalidMessageException(ResponseCode.FILE_NOT_FOUND_FAILURE, "File not found.");
         }
     }
-    
+
     /**
      * Uses the FileIDValidator to validate the format of a given file id.
-     * Also validates, that the file-id does not start with illegal 'path' characters (e.g. '..' or starts with a '/').
+     * This validation also catches the use of illegal starting characters that could refer to unauthorized directories.
+     *
      * @param fileID The id to validate.
      * @throws RequestHandlerException If the id of the file was invalid.
      */
     protected void validateFileIDFormat(String fileID) throws RequestHandlerException {
         ResponseInfo ri = fileIDValidator.validateFileID(fileID);
-        if(ri == null) {
-            if(fileID.contains("/..") || fileID.contains("../")) {
+        if (ri == null) {
+            if (fileID.contains("/..") || fileID.contains("../")) {
                 ri = new ResponseInfo();
                 ri.setResponseCode(ResponseCode.REQUEST_NOT_UNDERSTOOD_FAILURE);
-                ri.setResponseText("Invalid");                
+                ri.setResponseText("Invalid");
             }
         }
-        
-        if(ri != null) {
+
+        if (ri != null) {
             throw new InvalidMessageException(ri);
         }
     }
diff --git a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/PutFileRequestHandler.java b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/PutFileRequestHandler.java
index 5219f038b..52b2bebeb 100644
--- a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/PutFileRequestHandler.java
+++ b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/PutFileRequestHandler.java
@@ -3,21 +3,22 @@
  * bitrepository-access-client
  * *
  * $Id: PutFileRequestHandler.java 687 2012-01-09 12:56:47Z ktc $
- * $HeadURL: https://sbforge.org/svn/bitrepository/bitrepository-reference/trunk/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/PutFileRequestHandler.java $
+ * $HeadURL: https://sbforge.org/svn/bitrepository/bitrepository-reference/trunk/bitrepository-reference-pillar/src/main/java/org
+ * /bitrepository/pillar/messagehandler/PutFileRequestHandler.java $
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -45,17 +46,16 @@
  * Class for performing the PutFile operation.
  */
 public class PutFileRequestHandler extends PerformRequestHandler<PutFileRequest> {
-    /** The log.*/
-    private Logger log = LoggerFactory.getLogger(getClass());
-    
+    private final Logger log = LoggerFactory.getLogger(getClass());
+
     /**
      * @param context The context for the message handling.
-     * @param model The storage model for the pillar.
+     * @param model   The storage model for the pillar.
      */
     protected PutFileRequestHandler(MessageHandlerContext context, StorageModel model) {
         super(context, model);
     }
-    
+
     @Override
     public Class<PutFileRequest> getRequestClass() {
         return PutFileRequest.class;
@@ -65,97 +65,97 @@ public Class<PutFileRequest> getRequestClass() {
     public MessageResponse generateFailedResponse(PutFileRequest message) {
         return createFinalResponse(message);
     }
-    
+
     @Override
-    protected void validateRequest(PutFileRequest request, MessageContext requestContext) 
-            throws RequestHandlerException {
+    protected void validateRequest(PutFileRequest request, MessageContext requestContext) throws RequestHandlerException {
         validateCollectionID(request);
         validatePillarId(request.getPillarID());
-        if(request.getChecksumDataForNewFile() != null) {
-            getPillarModel().verifyChecksumAlgorithm(request.getChecksumDataForNewFile().getChecksumSpec(), 
-                    request.getCollectionID());
-        } else if(getSettings().getRepositorySettings().getProtocolSettings().isRequireChecksumForNewFileRequests()) {
-            throw new IllegalOperationException(ResponseCode.NEW_FILE_CHECKSUM_FAILURE, "A checksum is required for "
-                    + "the PutFile operation to be performed.", request.getFileID());
+        if (request.getChecksumDataForNewFile() != null) {
+            getPillarModel().verifyChecksumAlgorithm(request.getChecksumDataForNewFile().getChecksumSpec());
+        } else if (getSettings().getRepositorySettings().getProtocolSettings().isRequireChecksumForNewFileRequests()) {
+            throw new IllegalOperationException(ResponseCode.NEW_FILE_CHECKSUM_FAILURE,
+                    "A checksum is required for " + "the PutFile operation to be performed.", request.getFileID());
         }
-        
-        getPillarModel().verifyChecksumAlgorithm(request.getChecksumRequestForNewFile(), request.getCollectionID());
+
+        getPillarModel().verifyChecksumAlgorithm(request.getChecksumRequestForNewFile());
         validateFileIDFormat(request.getFileID());
-        
+
         checkThatTheFileDoesNotAlreadyExist(request);
         checkSpaceForStoringNewFile(request);
     }
 
     @Override
-    protected void sendProgressResponse(PutFileRequest request, MessageContext requestContext) 
-            throws RequestHandlerException {
+    protected void sendProgressResponse(PutFileRequest request, MessageContext requestContext) {
         PutFileProgressResponse response = createPutFileProgressResponse(request);
 
         ResponseInfo prInfo = new ResponseInfo();
         prInfo.setResponseCode(ResponseCode.OPERATION_ACCEPTED_PROGRESS);
-        prInfo.setResponseText("Started to receive data.");  
+        prInfo.setResponseText("Started to receive data.");
         response.setResponseInfo(prInfo);
 
         dispatchResponse(response, request);
     }
 
     @Override
-    protected void performOperation(PutFileRequest request, MessageContext requestContext) 
-            throws RequestHandlerException {
-        log.info(MessageUtils.createMessageIdentifier(request) + " Performing PutFile for file " 
-                + request.getFileID() + " on collection " + request.getCollectionID());
+    protected void performOperation(PutFileRequest request, MessageContext requestContext) throws RequestHandlerException {
+        log.info(MessageUtils.createMessageIdentifier(request) + " Performing PutFile for file " + request.getFileID() + " on collection " +
+                request.getCollectionID());
         try {
             retrieveFile(request);
-            getAuditManager().addAuditEvent(request.getCollectionID(), request.getFileID(), request.getFrom(), 
-                    "Add file to archive.", request.getAuditTrailInformation(), FileAction.PUT_FILE,
-                    request.getCorrelationID(), requestContext.getCertificateFingerprint());
+            getAuditManager().addAuditEvent(request.getCollectionID(), request.getFileID(), request.getFrom(), "Add file to archive.",
+                    request.getAuditTrailInformation(), FileAction.PUT_FILE, request.getCorrelationID(),
+                    requestContext.getCertificateFingerprint());
             sendFinalResponse(request);
         } finally {
             getPillarModel().ensureFileNotInTmpDir(request.getFileID(), request.getCollectionID());
         }
     }
-    
+
     /**
-     * Validates that the file is not already within the archive. 
-     * Otherwise an {@link InvalidMessageException} with the appropriate error code is thrown.
+     * Validates that the file is not already within the archive.
+     *
      * @param message The request with the filename to validate.
+     * @throws InvalidMessageException If the file already exists.
      */
-    private void checkThatTheFileDoesNotAlreadyExist(PutFileRequest message) throws RequestHandlerException {
-        if(getPillarModel().hasFileID(message.getFileID(), message.getCollectionID())) {
+    private void checkThatTheFileDoesNotAlreadyExist(PutFileRequest message) throws InvalidMessageException {
+        if (getPillarModel().hasFileID(message.getFileID(), message.getCollectionID())) {
             throw new InvalidMessageException(ResponseCode.DUPLICATE_FILE_FAILURE, "We already have the file");
         }
     }
-    
+
     /**
-     * Validates that enough space exists is left in the archive.
-     * Otherwise an {@link InvalidMessageException} with the appropriate error code is thrown.
-     * If the no size is defined in the message, then it is not checked.
+     * Validates that enough space exists is left in the archive.<br>
+     * If no size is defined in the message, then it is not checked.
+     *
      * @param message The request with the size of the file.
+     * @throws RequestHandlerException If there is not enough space free to store the file.
      */
     private void checkSpaceForStoringNewFile(PutFileRequest message) throws RequestHandlerException {
         long fileSize;
-        if(message.getFileSize() == null) {
+        if (message.getFileSize() == null) {
             log.debug("No size for the file to be put.");
             fileSize = 0L;
         } else {
             fileSize = message.getFileSize().longValue();
         }
-        
+
         getPillarModel().verifyEnoughFreeSpaceLeftForFile(fileSize, message.getCollectionID());
     }
-    
+
     /**
      * Retrieves the actual data, validates it and stores it.
+     *
      * @param message The request to for the file to put.
-     * @throws RequestHandlerException If the retrival of the file fails.
+     * @throws RequestHandlerException If the retrieval of the file fails.
      */
     private void retrieveFile(PutFileRequest message) throws RequestHandlerException {
-        getPillarModel().putFile(message.getCollectionID(), message.getFileID(), message.getFileAddress(), 
+        getPillarModel().putFile(message.getCollectionID(), message.getFileID(), message.getFileAddress(),
                 message.getChecksumDataForNewFile());
     }
-    
+
     /**
      * Method for sending the final response for the requested put operation.
+     *
      * @param message The request requesting the put operation.
      * @throws RequestHandlerException If the requested checksum specification is not supported.
      */
@@ -165,20 +165,21 @@ private void sendFinalResponse(PutFileRequest message) throws RequestHandlerExce
         ResponseInfo frInfo = new ResponseInfo();
         frInfo.setResponseCode(ResponseCode.OPERATION_COMPLETED);
         response.setResponseInfo(frInfo);
-        
-        if(message.getChecksumRequestForNewFile() != null) {
-            response.setChecksumDataForNewFile(getPillarModel().getChecksumDataForFile(message.getFileID(),
-                    message.getCollectionID(), message.getChecksumRequestForNewFile()));
+
+        if (message.getChecksumRequestForNewFile() != null) {
+            response.setChecksumDataForNewFile(getPillarModel().getChecksumDataForFile(message.getFileID(), message.getCollectionID(),
+                    message.getChecksumRequestForNewFile()));
         } else {
             log.debug("No checksum validation requested.");
         }
 
         dispatchResponse(response, message);
     }
-    
-    
+
+
     /**
-     * Creates a PutFileProgressResponse based on a PutFileRequest. 
+     * Creates a PutFileProgressResponse based on a PutFileRequest.
+     *
      * @param request The PutFileRequest to base the progress response on.
      * @return The PutFileProgressResponse based on the request.
      */
@@ -191,10 +192,10 @@ private PutFileProgressResponse createPutFileProgressResponse(PutFileRequest req
 
         return res;
     }
-    
+
     /**
-     * Creates a PutFileFinalResponse based on a PutFileRequest. 
-     *  
+     * Creates a PutFileFinalResponse based on a PutFileRequest.
+     *
      * @param request The PutFileRequest to base the final response message on.
      * @return The PutFileFinalResponse message based on the request.
      */
diff --git a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/ReplaceFileRequestHandler.java b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/ReplaceFileRequestHandler.java
index 656edb5e2..ebd415447 100644
--- a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/ReplaceFileRequestHandler.java
+++ b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/ReplaceFileRequestHandler.java
@@ -1,23 +1,23 @@
 /*
  * #%L
  * Bitrepository Reference Pillar
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -46,24 +46,23 @@
 
 /**
  * Class for handling the ReplaceFile operation.
- * In the positive scenario: <ul> 
- * <li> It starts by validating the message </li> 
+ * In the positive scenario: <ul>
+ * <li> It starts by validating the message </li>
  * <li> Afterwards it sends a positive progress to tell that the new file is being downloaded <>
  * <li> Then the new file is downloaded to 'tempDir' <>
  * <li> A progress message is then send to tell that the new file is replacing the old one.<>
- * <li> Then it performs the replacement of the file by deleting the old one (moving it from 'fileDir' to 'retainDir') 
+ * <li> Then it performs the replacement of the file by deleting the old one (moving it from 'fileDir' to 'retainDir')
  * and then moves the new file from 'tempDir' to 'fileDir'<>
  * <li> Finally the complete message is send.</li>
  * </ul>
  * If anything goes wrong a FinalResponse is send telling about the failure.
  */
 public class ReplaceFileRequestHandler extends PerformRequestHandler<ReplaceFileRequest> {
-    /** The log.*/
-    private Logger log = LoggerFactory.getLogger(getClass());
-    
+    private final Logger log = LoggerFactory.getLogger(getClass());
+
     /**
      * @param context The context for the message handling.
-     * @param model The storage model for the pillar.
+     * @param model   The storage model for the pillar.
      */
     protected ReplaceFileRequestHandler(MessageHandlerContext context, StorageModel model) {
         super(context, model);
@@ -78,20 +77,20 @@ public Class<ReplaceFileRequest> getRequestClass() {
     public MessageResponse generateFailedResponse(ReplaceFileRequest message) {
         return createFinalResponse(message);
     }
-    
+
     @Override
-    protected void validateRequest(ReplaceFileRequest request, MessageContext requestContext) 
+    protected void validateRequest(ReplaceFileRequest request, MessageContext requestContext)
             throws RequestHandlerException {
         validateCollectionID(request);
         validatePillarId(request.getPillarID());
         validateFileIDFormat(request.getFileID());
-        
-        if(!getPillarModel().hasFileID(request.getFileID(), request.getCollectionID())) {
-            throw new InvalidMessageException(ResponseCode.FILE_NOT_FOUND_FAILURE, "The file '" + request.getFileID() 
+
+        if (!getPillarModel().hasFileID(request.getFileID(), request.getCollectionID())) {
+            throw new InvalidMessageException(ResponseCode.FILE_NOT_FOUND_FAILURE, "The file '" + request.getFileID()
                     + "' has been requested, but we do not have that file!");
         }
 
-        getPillarModel().verifyEnoughFreeSpaceLeftForFile(request.getFileSize().longValue(), 
+        getPillarModel().verifyEnoughFreeSpaceLeftForFile(request.getFileSize().longValue(),
                 request.getCollectionID());
 
         validateChecksumAlgorithms(request);
@@ -99,13 +98,12 @@ protected void validateRequest(ReplaceFileRequest request, MessageContext reques
     }
 
     @Override
-    protected void sendProgressResponse(ReplaceFileRequest request, MessageContext requestContext) 
-            throws RequestHandlerException {
+    protected void sendProgressResponse(ReplaceFileRequest request, MessageContext requestContext) {
         ReplaceFileProgressResponse response = createProgressResponse(request);
         String responseText = "Performing the ReplaceFileRequest for file '" + request.getFileID() + "' at '"
                 + request.getCollectionID() + "'.";
         log.debug(responseText);
-        
+
         ResponseInfo responseInfo = new ResponseInfo();
         responseInfo.setResponseCode(ResponseCode.OPERATION_ACCEPTED_PROGRESS);
         responseInfo.setResponseText(responseText);
@@ -115,14 +113,14 @@ protected void sendProgressResponse(ReplaceFileRequest request, MessageContext r
     }
 
     @Override
-    protected void performOperation(ReplaceFileRequest request, MessageContext requestContext) 
+    protected void performOperation(ReplaceFileRequest request, MessageContext requestContext)
             throws RequestHandlerException {
-        log.info(MessageUtils.createMessageIdentifier(request) + " Performing ReplaceFile for file " 
+        log.info(MessageUtils.createMessageIdentifier(request) + " Performing ReplaceFile for file "
                 + request.getFileID() + " on collection " + request.getCollectionID());
         try {
             ChecksumDataForFileTYPE requestedOldChecksum = calculateChecksumOnOldFile(request);
             replaceFile(request);
-            getAuditManager().addAuditEvent(request.getCollectionID(), request.getFileID(), request.getFrom(), 
+            getAuditManager().addAuditEvent(request.getCollectionID(), request.getFileID(), request.getFrom(),
                     "Replacing the file.", request.getAuditTrailInformation(), FileAction.REPLACE_FILE,
                     request.getCorrelationID(), requestContext.getCertificateFingerprint());
 
@@ -132,58 +130,57 @@ protected void performOperation(ReplaceFileRequest request, MessageContext reque
             getPillarModel().ensureFileNotInTmpDir(request.getFileID(), request.getCollectionID());
         }
     }
-    
+
     /**
      * Validates that the checksum algorithms in the request are supported, and that the request contains the required
      * checksums for destructive and new file requests.
+     *
      * @param request The request.
-     * @throws RequestHandlerException If one (or more) of the algorithms are not supported, or if the required 
-     * checksums are not given. 
+     * @throws RequestHandlerException If one (or more) of the algorithms are not supported, or if the required
+     *                                 checksums are not given.
      */
     private void validateChecksumAlgorithms(ReplaceFileRequest request) throws RequestHandlerException {
-        getPillarModel().verifyChecksumAlgorithm(request.getChecksumRequestForExistingFile(), 
-                request.getCollectionID());
-        getPillarModel().verifyChecksumAlgorithm(request.getChecksumRequestForNewFile(), request.getCollectionID());
-        if(request.getChecksumDataForExistingFile() != null) {
-            getPillarModel().verifyChecksumAlgorithm(request.getChecksumDataForExistingFile().getChecksumSpec(), 
-                    request.getCollectionID());
-        } else if(getSettings().getRepositorySettings().getProtocolSettings()
+        getPillarModel().verifyChecksumAlgorithm(request.getChecksumRequestForExistingFile());
+        getPillarModel().verifyChecksumAlgorithm(request.getChecksumRequestForNewFile());
+        if (request.getChecksumDataForExistingFile() != null) {
+            getPillarModel().verifyChecksumAlgorithm(request.getChecksumDataForExistingFile().getChecksumSpec());
+        } else if (getSettings().getRepositorySettings().getProtocolSettings()
                 .isRequireChecksumForDestructiveRequests()) {
             throw new IllegalOperationException(ResponseCode.EXISTING_FILE_CHECKSUM_FAILURE, "According to the "
-                    + "contract a checksum for file to be deleted during the replacing operation is required.", 
+                    + "contract a checksum for file to be deleted during the replacing operation is required.",
                     request.getFileID());
         }
-        if(request.getChecksumDataForNewFile() != null) {
-            getPillarModel().verifyChecksumAlgorithm(request.getChecksumDataForNewFile().getChecksumSpec(), 
-                    request.getCollectionID());
-        } else if(getSettings().getRepositorySettings().getProtocolSettings()
+        if (request.getChecksumDataForNewFile() != null) {
+            getPillarModel().verifyChecksumAlgorithm(request.getChecksumDataForNewFile().getChecksumSpec());
+        } else if (getSettings().getRepositorySettings().getProtocolSettings()
                 .isRequireChecksumForNewFileRequests()) {
             throw new IllegalOperationException(ResponseCode.NEW_FILE_CHECKSUM_FAILURE, "According to the contract a "
                     + "checksum for new file in the replacing operation is required.",
                     request.getFileID());
         }
     }
-    
+
     /**
-     * Validates the the existing file has the expected checksum.
+     * Validates that the existing file has the expected checksum.
+     *
      * @param request The request containing info about which file and which checksum is expected.
      * @throws RequestHandlerException If the file does not have the expected checksum.
      */
     private void validateExistingChecksum(ReplaceFileRequest request) throws RequestHandlerException {
         ChecksumDataForFileTYPE checksumData = request.getChecksumDataForExistingFile();
-        if(checksumData != null) {
+        if (checksumData != null) {
             ChecksumSpecTYPE checksumType = checksumData.getChecksumSpec();
-            String calculatedChecksum = getPillarModel().getChecksumForFile(request.getFileID(), 
+            String calculatedChecksum = getPillarModel().getChecksumForFile(request.getFileID(),
                     request.getCollectionID(), checksumType);
             String requestedChecksum = Base16Utils.decodeBase16(checksumData.getChecksumValue());
-            if(!calculatedChecksum.equals(requestedChecksum)) {
+            if (!calculatedChecksum.equals(requestedChecksum)) {
                 // Log the different checksums, but do not send the right checksum back!
                 log.warn("Failed to handle replace operation on file '" + request.getFileID() + "' since the request "
-                        + "had the checksum '" + requestedChecksum + "' where our local file has the value '" 
+                        + "had the checksum '" + requestedChecksum + "' where our local file has the value '"
                         + calculatedChecksum + "'. Sending alarm and respond failure.");
                 String errMsg = "Requested to replace the file '" + request.getFileID() + "' with checksum '"
                         + requestedChecksum + "', but our file had a different checksum.";
-                
+
                 throw new IllegalOperationException(ResponseCode.EXISTING_FILE_CHECKSUM_FAILURE, errMsg,
                         request.getFileID());
             }
@@ -191,81 +188,86 @@ private void validateExistingChecksum(ReplaceFileRequest request) throws Request
             log.debug("No checksum for validation of the existing file before replace.");
         }
     }
-    
+
     /**
      * Calculates the checksum for the old file.
      * ONLY USE BEFORE THE REPLACE OPERATION HAS BEEN PERFORMED!
-     * @param message The message containing the request for the checksum to be calculated, along with the 
-     * specification about which algorithm and salt to use.
+     *
+     * @param message The message containing the request for the checksum to be calculated, along with the
+     *                specification about which algorithm and salt to use.
      * @return The checksum data for the old file in the archive.
-     * If no checksum specification for the 'old' file has been defined, then an null is returned.
+     * If no checksum specification for the 'old' file has been defined, then null is returned.
      * @throws RequestHandlerException If the checksum of the requested type cannot be retrieved.
      */
-    private ChecksumDataForFileTYPE calculateChecksumOnOldFile(ReplaceFileRequest message) 
+    private ChecksumDataForFileTYPE calculateChecksumOnOldFile(ReplaceFileRequest message)
             throws RequestHandlerException {
         ChecksumSpecTYPE csType = message.getChecksumRequestForExistingFile();
-        if(csType != null) {
+        if (csType != null) {
             return getPillarModel().getChecksumDataForFile(message.getFileID(), message.getCollectionID(), csType);
         }
-        
+
         return null;
     }
-    
+
     /**
      * Perform the replaceFile operation.
-     * 
-     * Downloading the new file to replace the old one. 
+     * <p>
+     * Downloading the new file to replace the old one.
      * Also validates against the given checksum. Will log a warning, if no checksum for validation is in the request.
+     *
      * @param message The request containing the location of the file and the checksum of it.
      */
     private void replaceFile(ReplaceFileRequest message) throws RequestHandlerException {
         log.info("Replacing the file '" + message.getFileID() + "' in the archive with the one in the "
                 + "temporary area.");
-        getPillarModel().replaceFile(message.getFileID(), message.getCollectionID(), 
+        getPillarModel().replaceFile(message.getFileID(), message.getCollectionID(),
                 message.getFileAddress(), message.getChecksumDataForNewFile());
     }
 
     /**
      * Calculates the checksum for the new file.
      * ONLY USE WHEN THE REPLACE OPERATION HAS BEEN PERFORMED!
-     * @param message The message containing the request for the checksum to be calculated, along with the 
-     * specification about which algorithm and salt to use.
+     *
+     * @param message The message containing the request for the checksum to be calculated, along with the
+     *                specification about which algorithm and salt to use.
      * @return The checksum data for the new file in the archive.
-     * If no checksum specification for the 'old' file has been defined, then an null is returned.
+     * If no checksum specification for the 'old' file has been defined, then null is returned.
      * @throws RequestHandlerException If the checksum of the requested type cannot be retrieved.
      */
-    private ChecksumDataForFileTYPE calculateChecksumOnNewFile(ReplaceFileRequest message) 
+    private ChecksumDataForFileTYPE calculateChecksumOnNewFile(ReplaceFileRequest message)
             throws RequestHandlerException {
         ChecksumSpecTYPE csType = message.getChecksumRequestForNewFile();
-        if(csType != null) {
+        if (csType != null) {
             return getPillarModel().getChecksumDataForFile(message.getFileID(), message.getCollectionID(), csType);
         }
-        
+
         return null;
     }
-    
+
     /**
      * Sends the final response for a successful finish of the operation.
-     * @param request The request to base the response upon.
+     *
+     * @param request              The request to base the response upon.
      * @param requestedOldChecksum The requested checksum for the old file, or null if no checksum for the old file.
      * @param requestedNewChecksum The requested checksum for the new file, or null if no checksum for the new file.
      */
     private void sendFinalResponse(ReplaceFileRequest request, ChecksumDataForFileTYPE requestedOldChecksum,
-            ChecksumDataForFileTYPE requestedNewChecksum) {
+                                   ChecksumDataForFileTYPE requestedNewChecksum) {
         ReplaceFileFinalResponse response = createFinalResponse(request);
-        
+
         ResponseInfo ri = new ResponseInfo();
         ri.setResponseCode(ResponseCode.OPERATION_COMPLETED);
         response.setResponseInfo(ri);
-        
+
         response.setChecksumDataForNewFile(requestedNewChecksum);
         response.setChecksumDataForExistingFile(requestedOldChecksum);
 
         dispatchResponse(response, request);
     }
-    
+
     /**
      * Creates the generic ReplaceFileFinalResponse based on the request.
+     *
      * @param request The ReplaceFileRequest to base the response upon.
      * @return The ReplaceFileFinalResponse based on the request.
      */
@@ -278,9 +280,10 @@ private ReplaceFileProgressResponse createProgressResponse(ReplaceFileRequest re
 
         return res;
     }
-    
+
     /**
      * Creates the generic ReplaceFileFinalResponse based on the request.
+     *
      * @param request The ReplaceFileRequest to base the response upon.
      * @return The ReplaceFileFinalResponse based on the request.
      */
diff --git a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/package-info.java b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/package-info.java
index 5da2e9dfe..b307dba07 100644
--- a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/package-info.java
+++ b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/package-info.java
@@ -24,7 +24,7 @@
  */
 /**
  * <p>
- * This package implementes a reference pillar.
+ * This package implements a reference pillar.
  * </p><p>
  * The class @see org.bitrepository.pillar.PillarAPI provides the basic interface for the reference pillar towards
  * the @see org.bitrepository.pillar.PillarMessageListener.
@@ -41,7 +41,7 @@
  * The actual implementation of the reference pillar is in the 
  *  org.bitrepository.pillar.referencepillar.ReferencePillar class.
  * </p><p>
- * Automatical creation of the response message for the reference pillar is done in the
+ * Automatic creation of the response message for the reference pillar is done in the
  *  org.bitrepository.pillar.ReferencePillarMessageFactory class.
  * </p><p>
  * The @see org.bitrepository.pillar.checksumpillar.ChecksumPillar is the implementation of the checksum pillar.
diff --git a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/schedulablejobs/RecalculateChecksumJob.java b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/schedulablejobs/RecalculateChecksumJob.java
index a92b3b433..971521c9c 100644
--- a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/schedulablejobs/RecalculateChecksumJob.java
+++ b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/schedulablejobs/RecalculateChecksumJob.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2013 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -33,28 +33,22 @@
  * Workflow for recalculating the checksums of the files of a given collection.
  */
 public class RecalculateChecksumJob implements SchedulableJob {
-    /** The log.*/
-    private Logger log = LoggerFactory.getLogger(getClass());
-    /** The id of the collection to recalculate the checksum for.*/
+    private final Logger log = LoggerFactory.getLogger(getClass());
     private final String collectionID;
-    /** The manager of the checksum and reference archive.*/
     private final StorageModel model;
-    
-    /** The state of this workflow. */
     private WorkflowState state = WorkflowState.NOT_RUNNING;
     private final JobID id;
-    
+
     /**
-     * Constructor.
      * @param collectionID The id of the collection to recalculate checksum for.
-     * @param model The storage model for the pillar.
+     * @param model        The storage model for the pillar.
      */
     public RecalculateChecksumJob(String collectionID, StorageModel model) {
         this.collectionID = collectionID;
         this.model = model;
         id = new JobID(getClass().getSimpleName(), collectionID);
     }
-    
+
     @Override
     public void start() {
         log.info("Recalculating old checksums for collection '" + collectionID + "'.");
@@ -93,6 +87,6 @@ public void setCurrentState(WorkflowState newState) {
 
     @Override
     public String getHumanReadableState() {
-       return state.name();
+        return state.name();
     }
 }
diff --git a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/ChecksumStorageModel.java b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/ChecksumStorageModel.java
index 20cff68e9..81829d17d 100644
--- a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/ChecksumStorageModel.java
+++ b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/ChecksumStorageModel.java
@@ -1,35 +1,29 @@
 /*
  * #%L
  * Bitmagasin
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.pillar.store;
 
-import java.io.IOException;
-import java.net.URL;
-import java.util.Date;
-
-import javax.xml.datatype.XMLGregorianCalendar;
-
 import org.bitrepository.bitrepositoryelements.ChecksumDataForFileTYPE;
 import org.bitrepository.bitrepositoryelements.ChecksumSpecTYPE;
 import org.bitrepository.bitrepositoryelements.ResponseCode;
@@ -49,12 +43,16 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.xml.datatype.XMLGregorianCalendar;
+import java.io.IOException;
+import java.net.URL;
+import java.util.Date;
+
 /**
  * The storage model for a pillar without a file store.
  */
 public class ChecksumStorageModel extends StorageModel {
-    /** The log.*/
-    private Logger log = LoggerFactory.getLogger(getClass());
+    private final Logger log = LoggerFactory.getLogger(getClass());
 
     /**
      * @param cache           The storage for the checksums.
@@ -62,34 +60,31 @@ public class ChecksumStorageModel extends StorageModel {
      * @param settings        The configuration to use.
      * @param fileExchange    The file exchange.
      */
-    public ChecksumStorageModel(ChecksumStore cache, AlarmDispatcher alarmDispatcher, Settings settings, 
-            FileExchange fileExchange) {
+    public ChecksumStorageModel(ChecksumStore cache, AlarmDispatcher alarmDispatcher, Settings settings, FileExchange fileExchange) {
         super(null, cache, alarmDispatcher, settings, fileExchange);
     }
-    
+
     @Override
     public ChecksumSpecTYPE getChecksumPillarSpec() {
         return defaultChecksumSpec;
     }
 
     @Override
-    public void verifyEnoughFreeSpaceLeftForFile(Long fileSize, String collectionID) throws RequestHandlerException {
+    public void verifyEnoughFreeSpaceLeftForFile(Long fileSize, String collectionID) {
         // Does not require the actual file. 
     }
 
     @Override
-    public void replaceFile(String fileID, String collectionID, String fileAddress, 
-            ChecksumDataForFileTYPE expectedChecksum) throws RequestHandlerException {
-        String calculatedChecksum = retrieveChecksumFromDownloadOrVerificationData(fileID, collectionID, fileAddress, 
-                expectedChecksum);
+    public void replaceFile(String fileID, String collectionID, String fileAddress, ChecksumDataForFileTYPE expectedChecksum)
+            throws RequestHandlerException {
+        String calculatedChecksum = retrieveChecksumFromDownloadOrVerificationData(fileID, collectionID, fileAddress, expectedChecksum);
         cache.insertChecksumCalculation(fileID, collectionID, calculatedChecksum, new Date());
     }
 
     @Override
-    public void putFile(String collectionID, String fileID, String fileAddress, 
-            ChecksumDataForFileTYPE expectedChecksum) throws RequestHandlerException {
-        String calculatedChecksum = retrieveChecksumFromDownloadOrVerificationData(fileID, collectionID, fileAddress, 
-                expectedChecksum);
+    public void putFile(String collectionID, String fileID, String fileAddress, ChecksumDataForFileTYPE expectedChecksum)
+            throws RequestHandlerException {
+        String calculatedChecksum = retrieveChecksumFromDownloadOrVerificationData(fileID, collectionID, fileAddress, expectedChecksum);
         cache.insertChecksumCalculation(fileID, collectionID, calculatedChecksum, new Date());
     }
 
@@ -104,120 +99,124 @@ protected void verifyFileToCacheConsistencyIfRequired(String fileID, String coll
     }
 
     @Override
-    protected String getNonDefaultChecksum(String fileID, String collectionID, ChecksumSpecTYPE csType)
-            throws RequestHandlerException {
-        throw new InvalidMessageException(ResponseCode.REQUEST_NOT_SUPPORTED, "The ChecksumPillar cannot handle a "
-                + "non-default checksum specification '" + csType + "'.'");
+    protected String getNonDefaultChecksum(String fileID, String collectionID, ChecksumSpecTYPE csType) throws RequestHandlerException {
+        throw new InvalidMessageException(ResponseCode.REQUEST_NOT_SUPPORTED,
+                "The ChecksumPillar cannot handle a " + "non-default checksum specification '" + csType + "'.'");
     }
 
     @Override
-    public FileInfo getFileInfoForActualFile(String fileID, String collectionID)
-            throws RequestHandlerException {
-        throw new InvalidMessageException(ResponseCode.REQUEST_NOT_SUPPORTED, "This is a checksum pillar and it does "
-                + "not have the actual file. Only it's checksum.");
+    public FileInfo getFileInfoForActualFile(String fileID, String collectionID) throws RequestHandlerException {
+        throw new InvalidMessageException(ResponseCode.REQUEST_NOT_SUPPORTED,
+                "This is a checksum pillar and it does " + "not have the actual file. Only it's checksum.");
     }
 
     @Override
-    public ExtractedFileIDsResultSet getFileIDsResultSet(String fileID, XMLGregorianCalendar minTimestamp, 
-            XMLGregorianCalendar maxTimestamp, Long maxResults, String collectionID) {
+    public ExtractedFileIDsResultSet getFileIDsResultSet(String fileID, XMLGregorianCalendar minTimestamp,
+                                                         XMLGregorianCalendar maxTimestamp, Long maxResults, String collectionID) {
         return cache.getFileIDs(minTimestamp, maxTimestamp, maxResults, fileID, collectionID);
     }
 
     @Override
-    protected ExtractedChecksumResultSet getNonDefaultChecksumResultSet(Long maxResults, String collectionID, 
-            ChecksumSpecTYPE csSpec) throws RequestHandlerException {
-        throw new InvalidMessageException(ResponseCode.REQUEST_NOT_SUPPORTED, "This is a checksum pillar and it does "
-                + "not have the actual file. Only it's checksum.");
+    protected ExtractedChecksumResultSet getNonDefaultChecksumResultSet(Long maxResults, String collectionID, ChecksumSpecTYPE csSpec)
+            throws RequestHandlerException {
+        throw new InvalidMessageException(ResponseCode.REQUEST_NOT_SUPPORTED,
+                "This is a checksum pillar and it does " + "not have the actual file. Only it's checksum.");
     }
 
     @Override
     public void verifyFileExists(String fileID, String collectionID) throws RequestHandlerException {
-        throw new InvalidMessageException(ResponseCode.REQUEST_NOT_SUPPORTED, "This is a checksum pillar and it does "
-                + "not have the actual file. Only it's checksum.");
+        throw new InvalidMessageException(ResponseCode.REQUEST_NOT_SUPPORTED,
+                "This is a checksum pillar and it does " + "not have the actual file. Only it's checksum.");
     }
-    
+
     /**
      * Retrieves the checksum either by downloading the file from the file-address and calculating the checksum, or
      * by extracting it from the verification data.
      * Strategy is decided by the settings for this ChecksumPillar.
-     * @param fileID The ID of the file.
-     * @param collectionID The ID of the collection.
-     * @param fileAddress The address where the file can be download from, if necessary.
-     * @param expectedChecksum The expected results for calculation the checksum of the file. The checksum can be 
-     * extracted from here instead.
+     *
+     * @param fileID           The ID of the file.
+     * @param collectionID     The ID of the collection.
+     * @param fileAddress      The address where the file can be downloaded from, if necessary.
+     * @param expectedChecksum The expected results for calculation the checksum of the file. The checksum can be
+     *                         extracted from here instead.
      * @return The checksum.
      * @throws RequestHandlerException If something goes wrong with extracting the checksum, e.g. it is missing from
-     * the 'expectedChecksum' part, it is not possible to download, or the downloaded file does not have the expected 
-     * checksum.
+     *                                 the 'expectedChecksum' part, it is not possible to download, or the downloaded file does not have
+     *                                 the expected
+     *                                 checksum.
      */
-    private String retrieveChecksumFromDownloadOrVerificationData(String fileID, String collectionID, 
-            String fileAddress, ChecksumDataForFileTYPE expectedChecksum) throws RequestHandlerException {
-        switch(getChecksumPillarFileDownload()) {
-        case ALWAYS_DOWNLOAD:
-            return downloadFileAndCalculateChecksum(fileID, collectionID, fileAddress, expectedChecksum);
-        case NEVER_DOWNLOAD:
-            return extractChecksum(expectedChecksum);
-        default:
-            if(expectedChecksum != null) {
+    private String retrieveChecksumFromDownloadOrVerificationData(String fileID, String collectionID, String fileAddress,
+                                                                  ChecksumDataForFileTYPE expectedChecksum) throws RequestHandlerException {
+        switch (getChecksumPillarFileDownload()) {
+            case ALWAYS_DOWNLOAD:
+                return downloadFileAndCalculateChecksum(fileID, collectionID, fileAddress, expectedChecksum);
+            case NEVER_DOWNLOAD:
                 return extractChecksum(expectedChecksum);
-            } else {
-                return downloadFileAndCalculateChecksum(fileID, collectionID, fileAddress, null);
-            }
+            default:
+                if (expectedChecksum != null) {
+                    return extractChecksum(expectedChecksum);
+                } else {
+                    return downloadFileAndCalculateChecksum(fileID, collectionID, fileAddress, null);
+                }
         }
     }
 
     /**
      * Retrieves the ChecksumPillarFileDownload from settings. If not set, then the default value is
      * 'DOWNLOAD_WHEN_MISSING_FROM_MESSAGE'.
+     *
      * @return Whether the ChecksumPillar should download the files regarding PutFileRequests.
      */
     protected ChecksumPillarFileDownload getChecksumPillarFileDownload() {
-        if(settings.getReferenceSettings().getPillarSettings().getChecksumPillarFileDownload() 
-                == null) {
+        if (settings.getReferenceSettings().getPillarSettings().getChecksumPillarFileDownload() == null) {
             return ChecksumPillarFileDownload.DOWNLOAD_WHEN_MISSING_FROM_MESSAGE;
         } else {
             return settings.getReferenceSettings().getPillarSettings().getChecksumPillarFileDownload();
         }
-    }    
-    
+    }
+
     /**
-     * Extracts the checksum from ChecksumDataForFileTYPE. 
+     * Extracts the checksum from ChecksumDataForFileTYPE.
+     *
      * @param checksumData The message to extract the checksum from.
      * @return The checksum from the message.
      * @throws RequestHandlerException If the checksum data does not contain the checksum.
      */
-    private String extractChecksum(ChecksumDataForFileTYPE checksumData) 
-            throws RequestHandlerException {
-        if(checksumData != null) {
+    private String extractChecksum(ChecksumDataForFileTYPE checksumData) throws RequestHandlerException {
+        if (checksumData != null) {
             return Base16Utils.decodeBase16(checksumData.getChecksumValue());
         } else {
-            throw new InvalidMessageException(ResponseCode.NEW_FILE_CHECKSUM_FAILURE, "The checksum should have been "
-                    + "provided with the message");
+            throw new InvalidMessageException(ResponseCode.NEW_FILE_CHECKSUM_FAILURE,
+                    "The checksum should have been " + "provided with the message");
         }
     }
 
     /**
      * Retrieves the actual data, validates it (if possible).
-     * @param message The request to for the file to put.
+     *
+     * @param fileID       The ID of the file.
+     * @param collectionID The collection ID in where the file is located.
+     * @param fileAddress  The address where the file can be found at.
      * @return The checksum of the retrieved file.
      * @throws RequestHandlerException If the operation fails.
      */
-    private String downloadFileAndCalculateChecksum(String fileID, String collectionID, String fileAddress, 
-            ChecksumDataForFileTYPE expectedChecksum) throws RequestHandlerException {
+    private String downloadFileAndCalculateChecksum(String fileID, String collectionID, String fileAddress,
+                                                    ChecksumDataForFileTYPE expectedChecksum) throws RequestHandlerException {
         String calculatedChecksum = calculateChecksumForFileAtURL(fileAddress);
-        if(!validChecksum(calculatedChecksum, expectedChecksum)) {
+        if (!validChecksum(calculatedChecksum, expectedChecksum)) {
             String givenChecksum = Base16Utils.decodeBase16(expectedChecksum.getChecksumValue());
-            log.error("Wrong checksum for file '" + fileID + "' at '" + collectionID + "'! Expected: [" 
-                    + givenChecksum + "], but calculated: [" + calculatedChecksum + "]");
-            throw new IllegalOperationException(ResponseCode.NEW_FILE_CHECKSUM_FAILURE, "Expected checksums '" 
-                    + givenChecksum + "' but the checksum was '" + calculatedChecksum + "'.", fileID);
+            log.error("Wrong checksum for file '" + fileID + "' at '" + collectionID + "'! Expected: [" + givenChecksum +
+                    "], but calculated: [" + calculatedChecksum + "]");
+            throw new IllegalOperationException(ResponseCode.NEW_FILE_CHECKSUM_FAILURE,
+                    "Expected checksums '" + givenChecksum + "' but the checksum was '" + calculatedChecksum + "'.", fileID);
         }
 
         return calculatedChecksum;
     }
-    
+
     /**
      * Calculates the checksum for a file at a given URL.
+     *
      * @param fileAddress The URL for the file.
      * @return The checksum for the file.
      * @throws RequestHandlerException If data for the file could not be retrieved.
@@ -226,28 +225,26 @@ private String calculateChecksumForFileAtURL(String fileAddress) throws RequestH
         log.debug("Retrieving the data from URL: '" + fileAddress + "'");
 
         try {
-            return ChecksumUtils.generateChecksum(fileExchange.getFile(new URL(fileAddress)),
-                    defaultChecksumSpec);
+            return ChecksumUtils.generateChecksum(fileExchange.getFile(new URL(fileAddress)), defaultChecksumSpec);
         } catch (IOException e) {
             String errMsg = "Could not retrieve the file from '" + fileAddress + "'";
             log.error(errMsg, e);
             throw new InvalidMessageException(ResponseCode.FILE_TRANSFER_FAILURE, errMsg, null);
         }
     }
-    
+
     /**
      * Checks whether a calculated checksum is identical to a given checksum.
+     *
      * @param calculatedChecksum The calculated checksum.
-     * @param expectedChecksum The expected checksum, may be null (will give a 'true' answer).
+     * @param expectedChecksum   The expected checksum, may be null (will give a 'true' answer).
      * @return Whether the calculated checksum is the same as the expected one (or true, if nothing is expected).
      */
     private boolean validChecksum(String calculatedChecksum, ChecksumDataForFileTYPE expectedChecksum) {
-        if(expectedChecksum != null) {
+        if (expectedChecksum != null) {
             String givenChecksum = Base16Utils.decodeBase16(expectedChecksum.getChecksumValue());
-            if(!calculatedChecksum.equals(givenChecksum)) {
-                return false;
-            }
-        }        
+            return calculatedChecksum.equals(givenChecksum);
+        }
         return true;
     }
 
diff --git a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/FileStorageModel.java b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/FileStorageModel.java
index 033782e7d..fe552c76b 100644
--- a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/FileStorageModel.java
+++ b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/FileStorageModel.java
@@ -1,37 +1,29 @@
 /*
  * #%L
- * Bitmagasin 
- * 
+ * Bitmagasin
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.pillar.store;
 
-import java.io.IOException;
-import java.net.URL;
-import java.util.Date;
-import java.util.Map;
-import java.util.concurrent.ConcurrentSkipListMap;
-
-import javax.xml.datatype.XMLGregorianCalendar;
-
 import org.bitrepository.bitrepositoryelements.Alarm;
 import org.bitrepository.bitrepositoryelements.AlarmCode;
 import org.bitrepository.bitrepositoryelements.ChecksumDataForFileTYPE;
@@ -56,11 +48,18 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.xml.datatype.XMLGregorianCalendar;
+import java.io.IOException;
+import java.net.URL;
+import java.util.Date;
+import java.util.Map;
+import java.util.concurrent.ConcurrentSkipListMap;
+
 /**
  * The storage model for a pillar with a file store, where it can store its actual files.
  */
 public class FileStorageModel extends StorageModel {
-    private Logger log = LoggerFactory.getLogger(getClass());
+    private final Logger log = LoggerFactory.getLogger(getClass());
 
     /**
      * @param archives        The file archives.
@@ -70,7 +69,7 @@ public class FileStorageModel extends StorageModel {
      * @param fileExchange    The file exchange.
      */
     public FileStorageModel(FileStore archives, ChecksumStore cache, AlarmDispatcher alarmDispatcher,
-            Settings settings, FileExchange fileExchange) {
+                            Settings settings, FileExchange fileExchange) {
         super(archives, cache, alarmDispatcher, settings, fileExchange);
         log.info("Instantiating the FileStorageModel: " + getPillarID());
     }
@@ -79,7 +78,7 @@ public FileStorageModel(FileStore archives, ChecksumStore cache, AlarmDispatcher
     public void verifyFileToCacheConsistencyOfAllDataIfRequired(
             String collectionID) {
         Boolean verify = settings.getReferenceSettings().getPillarSettings().isVerifyDataConsistencyOnMessage();
-        if(verify != null && verify) {
+        if (verify != null && verify) {
             verifyFileToCacheConsistencyOfAllData(collectionID);
         }
     }
@@ -87,7 +86,7 @@ public void verifyFileToCacheConsistencyOfAllDataIfRequired(
     @Override
     protected void verifyFileToCacheConsistencyIfRequired(String fileID, String collectionID) {
         Boolean verify = settings.getReferenceSettings().getPillarSettings().isVerifyDataConsistencyOnMessage();
-        if(verify != null && verify) {
+        if (verify != null && verify) {
             recalculateChecksum(fileID, collectionID);
         }
     }
@@ -105,23 +104,23 @@ public FileInfo getFileInfoForActualFile(String fileID, String collectionID) {
 
     @Override
     public ExtractedFileIDsResultSet getFileIDsResultSet(String fileID, XMLGregorianCalendar minTimestamp,
-            XMLGregorianCalendar maxTimestamp, Long maxResults, String collectionID) {
+                                                         XMLGregorianCalendar maxTimestamp, Long maxResults, String collectionID) {
         Long minTime = null;
-        if(minTimestamp != null) {
+        if (minTimestamp != null) {
             minTime = CalendarUtils.convertFromXMLGregorianCalendar(minTimestamp).getTime();
         }
         Long maxTime = null;
-        if(maxTimestamp != null) {
+        if (maxTimestamp != null) {
             maxTime = CalendarUtils.convertFromXMLGregorianCalendar(maxTimestamp).getTime();
         }
 
-        if(fileID == null) {
+        if (fileID == null) {
             return getFileIds(minTime, maxTime, maxResults, collectionID);
         }
 
         ExtractedFileIDsResultSet res = new ExtractedFileIDsResultSet();
         FileInfo entry = fileArchive.getFileInfo(fileID, collectionID);
-        if((minTime == null || minTime <= entry.getLastModifiedDate()) &&
+        if ((minTime == null || minTime <= entry.getLastModifiedDate()) &&
                 (maxTime == null || maxTime >= entry.getLastModifiedDate())) {
             res.insertFileInfo(entry);
         }
@@ -131,11 +130,11 @@ public ExtractedFileIDsResultSet getFileIDsResultSet(String fileID, XMLGregorian
 
     @Override
     public void verifyEnoughFreeSpaceLeftForFile(Long fileSize,
-            String collectionID) throws RequestHandlerException {
-        long useableSizeLeft = fileArchive.sizeLeftInArchive(collectionID) 
+                                                 String collectionID) throws RequestHandlerException {
+        long useableSizeLeft = fileArchive.sizeLeftInArchive(collectionID)
                 - settings.getReferenceSettings().getPillarSettings().getMinimumSizeLeft();
 
-        if(useableSizeLeft < fileSize) {
+        if (useableSizeLeft < fileSize) {
             throw new IdentifyContributorException(ResponseCode.FAILURE, "Not enough space left in this pillar. "
                     + "Requires '" + fileSize + "' but has only '" + useableSizeLeft + "'");
         }
@@ -147,8 +146,8 @@ protected ExtractedChecksumResultSet getNonDefaultChecksumResultSet(
         ExtractedChecksumResultSet res = new ExtractedChecksumResultSet();
 
         long i = 0;
-        for(String fileID : cache.getAllFileIDs(collectionID)) {
-            if(maxResults != null && i > maxResults) {
+        for (String fileID : cache.getAllFileIDs(collectionID)) {
+            if (maxResults != null && i > maxResults) {
                 break;
             }
             i++;
@@ -163,8 +162,8 @@ protected ExtractedChecksumResultSet getNonDefaultChecksumResultSet(
     @Override
     public void verifyFileExists(String fileID, String collectionID)
             throws RequestHandlerException {
-        if(!hasFileID(fileID, collectionID)) {
-            log.warn("The file '" + fileID + "' has been requested, but we do not have that file in collection '" 
+        if (!hasFileID(fileID, collectionID)) {
+            log.warn("The file '" + fileID + "' has been requested, but we do not have that file in collection '"
                     + collectionID + "'!");
             throw new InvalidMessageException(ResponseCode.FILE_NOT_FOUND_FAILURE, "File not found.");
         }
@@ -178,7 +177,7 @@ public ChecksumSpecTYPE getChecksumPillarSpec() {
 
     @Override
     public void putFile(String collectionID, String fileID, String fileAddress,
-            ChecksumDataForFileTYPE expectedChecksum) throws RequestHandlerException {
+                        ChecksumDataForFileTYPE expectedChecksum) throws RequestHandlerException {
         transferFileToTmp(fileID, collectionID, fileAddress);
         verifyFileInTmp(fileID, collectionID, expectedChecksum);
         fileArchive.moveToArchive(fileID, collectionID);
@@ -187,7 +186,7 @@ public void putFile(String collectionID, String fileID, String fileAddress,
 
     @Override
     public void replaceFile(String fileID, String collectionID, String fileAddress,
-            ChecksumDataForFileTYPE expectedChecksum) throws RequestHandlerException {
+                            ChecksumDataForFileTYPE expectedChecksum) throws RequestHandlerException {
         transferFileToTmp(fileID, collectionID, fileAddress);
         verifyFileInTmp(fileID, collectionID, expectedChecksum);
         fileArchive.replaceFile(fileID, collectionID);
@@ -196,7 +195,8 @@ public void replaceFile(String fileID, String collectionID, String fileAddress,
 
     /**
      * Recalculates the checksum of a given file based on the default checksum specification.
-     * @param fileID The id of the file to recalculate its default checksum for.
+     *
+     * @param fileID       The id of the file to recalculate its default checksum for.
      * @param collectionID The id of the collection of the file.
      */
     protected void recalculateChecksum(String fileID, String collectionID) {
@@ -208,9 +208,10 @@ protected void recalculateChecksum(String fileID, String collectionID) {
 
     /**
      * Calculates the checksum of a file within the tmpDir.
-     * @param fileID The id of the file to calculate the checksum for.
+     *
+     * @param fileID       The id of the file to calculate the checksum for.
      * @param collectionID The id of the collection of the file.
-     * @param csType The specification for the type of checksum to calculate.
+     * @param csType       The specification for the type of checksum to calculate.
      * @return The checksum of the given type for the file with the given id.
      */
     private String getChecksumForTempFile(String fileID, String collectionID, ChecksumSpecTYPE csType) {
@@ -220,21 +221,22 @@ private String getChecksumForTempFile(String fileID, String collectionID, Checks
 
     /**
      * TODO this should be in the database instead.
-     * @param minTime The minimum date for the timestamp of the extracted file ids entries.
-     * @param maxTime The maximum date for the timestamp of the extracted file ids entries.
+     *
+     * @param minTime            The minimum date for the timestamp of the extracted file ids entries.
+     * @param maxTime            The maximum date for the timestamp of the extracted file ids entries.
      * @param maxNumberOfResults The maximum number of results.
-     * @param collectionID The id of the collection.
+     * @param collectionID       The id of the collection.
      * @return The requested file ids.
      */
-    private ExtractedFileIDsResultSet getFileIds(Long minTime, Long maxTime, Long maxNumberOfResults, 
-            String collectionID) {
+    private ExtractedFileIDsResultSet getFileIds(Long minTime, Long maxTime, Long maxNumberOfResults,
+                                                 String collectionID) {
         ExtractedFileIDsResultSet res = new ExtractedFileIDsResultSet();
 
         // Map between lastModifiedDate and fileInfo.
         ConcurrentSkipListMap<Long, FileInfo> sortedDateFileIDMap = new ConcurrentSkipListMap<>();
-        for(String fileID : fileArchive.getAllFileIds(collectionID)) {
+        for (String fileID : fileArchive.getAllFileIds(collectionID)) {
             FileInfo fi = fileArchive.getFileInfo(fileID, collectionID);
-            if((minTime == null || minTime <= fi.getLastModifiedDate()) &&
+            if ((minTime == null || minTime <= fi.getLastModifiedDate()) &&
                     (maxTime == null || maxTime >= fi.getLastModifiedDate())) {
                 sortedDateFileIDMap.put(fi.getLastModifiedDate(), fi);
             }
@@ -242,13 +244,13 @@ private ExtractedFileIDsResultSet getFileIds(Long minTime, Long maxTime, Long ma
 
         int i = 0;
         Map.Entry<Long, FileInfo> entry;
-        while((entry = sortedDateFileIDMap.pollFirstEntry()) != null && 
+        while ((entry = sortedDateFileIDMap.pollFirstEntry()) != null &&
                 (maxNumberOfResults == null || i < maxNumberOfResults)) {
             res.insertFileInfo(entry.getValue());
             i++;
         }
 
-        if(maxNumberOfResults != null && i >= maxNumberOfResults) {
+        if (maxNumberOfResults != null && i >= maxNumberOfResults) {
             res.reportMoreEntriesFound();
         }
 
@@ -257,18 +259,18 @@ private ExtractedFileIDsResultSet getFileIds(Long minTime, Long maxTime, Long ma
 
     @Override
     public void verifyFileToCacheConsistencyOfAllData(String collectionID) {
-        for(String fileID : cache.getAllFileIDs(collectionID)) {
+        for (String fileID : cache.getAllFileIDs(collectionID)) {
             verifyCacheToArchiveConsistencyForFile(fileID, collectionID);
         }
 
-        for(String fileID : fileArchive.getAllFileIds(collectionID)) {
+        for (String fileID : fileArchive.getAllFileIds(collectionID)) {
             verifyArchiveToCacheConsistencyForFile(fileID, collectionID);
         }
 
         long maxAgeForChecksums = settings.getReferenceSettings().getPillarSettings()
                 .getMaxAgeForChecksums().longValue();
         Date checksumDate = new Date(System.currentTimeMillis() - maxAgeForChecksums);
-        for(String fileID : cache.getFileIDsWithOldChecksums(checksumDate, collectionID)) {
+        for (String fileID : cache.getFileIDsWithOldChecksums(checksumDate, collectionID)) {
             recalculateChecksum(fileID, collectionID);
         }
         // TODO: validate the 'last modified' timestamp ? 
@@ -277,11 +279,12 @@ public void verifyFileToCacheConsistencyOfAllData(String collectionID) {
     /**
      * Ensures that a file id in the cache is also in the archive.
      * Will send an alarm, if the file is missing, then remove it from index.
-     * @param fileID The id of the file.
+     *
+     * @param fileID       The id of the file.
      * @param collectionID The id of the collection of the file.
      */
     private void verifyCacheToArchiveConsistencyForFile(String fileID, String collectionID) {
-        if(!fileArchive.hasFile(fileID, collectionID)) {
+        if (!fileArchive.hasFile(fileID, collectionID)) {
             log.warn("The file '" + fileID + "' in the ChecksumCache is no longer in the archive. "
                     + "Dispatching an alarm, and removing it from the cache.");
             Alarm alarm = new Alarm();
@@ -296,13 +299,14 @@ private void verifyCacheToArchiveConsistencyForFile(String fileID, String collec
     }
 
     /**
-     * Ensures that the cache has an non-obsolete checksum for the given file.
-     * Also validates, that the checksum is up to date with the file.
-     * @param fileID The id of the file.
+     * Ensures that the cache has a non-obsolete checksum for the given file.
+     * Also validates, that the checksum is up-to-date with the file.
+     *
+     * @param fileID       The id of the file.
      * @param collectionID The id of the collection of the file.
      */
     private void verifyArchiveToCacheConsistencyForFile(String fileID, String collectionID) {
-        if(!cache.hasFile(fileID, collectionID)) {
+        if (!cache.hasFile(fileID, collectionID)) {
             log.debug("No checksum cached for file '" + fileID + "'. Calculating the checksum.");
             recalculateChecksum(fileID, collectionID);
         }
@@ -310,13 +314,13 @@ private void verifyArchiveToCacheConsistencyForFile(String fileID, String collec
 
     /**
      * Downloads the file to temporary area.
-     * 
-     * @param fileID The id of the file.
+     *
+     * @param fileID       The id of the file.
      * @param collectionID The id of the collection.
-     * @param fileAddress The address to download the file from.
+     * @param fileAddress  The address to download the file from.
      * @throws RequestHandlerException If the download fails.
      */
-    private void transferFileToTmp(String fileID, String collectionID, String fileAddress) 
+    private void transferFileToTmp(String fileID, String collectionID, String fileAddress)
             throws RequestHandlerException {
         log.debug("Retrieving the data to be stored from URL: '" + fileAddress + "'");
 
@@ -327,33 +331,33 @@ private void transferFileToTmp(String fileID, String collectionID, String fileAd
             String errMsg = "Could not retrieve the file from '" + fileAddress + "'";
             log.error(errMsg, e);
             throw new InvalidMessageException(ResponseCode.FILE_TRANSFER_FAILURE, errMsg, e);
-        }        
+        }
     }
 
     /**
      * Verifies that a file in temporary area has the expected checksum.
-     * 
-     * @param fileID The id of the file.
-     * @param collectionID The id of the collection.
+     *
+     * @param fileID           The id of the file.
+     * @param collectionID     The id of the collection.
      * @param expectedChecksum The expected checksum for the downloaded file.
-     * @throws RequestHandlerException If it does not have the expected checksum. 
+     * @throws RequestHandlerException If it does not have the expected checksum.
      */
-    private void verifyFileInTmp(String fileID, String collectionID, ChecksumDataForFileTYPE expectedChecksum) 
+    private void verifyFileInTmp(String fileID, String collectionID, ChecksumDataForFileTYPE expectedChecksum)
             throws RequestHandlerException {
-        if(expectedChecksum != null) {
-            String calculatedChecksum = getChecksumForTempFile(fileID, collectionID, 
+        if (expectedChecksum != null) {
+            String calculatedChecksum = getChecksumForTempFile(fileID, collectionID,
                     expectedChecksum.getChecksumSpec());
             String expectedChecksumValue = Base16Utils.decodeBase16(expectedChecksum.getChecksumValue());
-            log.debug("Validating newly downloaded file, '" + fileID + "', against expected checksum '" 
+            log.debug("Validating newly downloaded file, '" + fileID + "', against expected checksum '"
                     + expectedChecksumValue + "'.");
-            if(!calculatedChecksum.equals(expectedChecksumValue)) {
-                log.warn("Wrong checksum! Expected: [" + expectedChecksumValue 
+            if (!calculatedChecksum.equals(expectedChecksumValue)) {
+                log.warn("Wrong checksum! Expected: [" + expectedChecksumValue
                         + "], but calculated: [" + calculatedChecksum + "]");
                 throw new IllegalOperationException(ResponseCode.NEW_FILE_CHECKSUM_FAILURE, "The downloaded file does "
                         + "not have the expected checksum", fileID);
             }
         } else {
             log.debug("No checksums for validating the newly downloaded file '" + fileID + "'.");
-        }        
+        }
     }
 }
diff --git a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/StorageModel.java b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/StorageModel.java
index 73a1dd4b6..4336ff3d2 100644
--- a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/StorageModel.java
+++ b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/StorageModel.java
@@ -1,34 +1,29 @@
 /*
  * #%L
  * Bitmagasin
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.pillar.store;
 
-import java.security.NoSuchAlgorithmException;
-import java.util.Date;
-
-import javax.xml.datatype.XMLGregorianCalendar;
-
 import org.bitrepository.bitrepositoryelements.ChecksumDataForFileTYPE;
 import org.bitrepository.bitrepositoryelements.ChecksumSpecTYPE;
 import org.bitrepository.bitrepositoryelements.ResponseCode;
@@ -49,27 +44,26 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.xml.datatype.XMLGregorianCalendar;
+import java.security.NoSuchAlgorithmException;
+import java.util.Date;
+
 /**
  * Storage model for the file data.
- * Involves having the checksums in a checksum store (database), 
+ * Involves having the checksums in a checksum store (database),
  * and potentially having the actual files in a file store (file system).
  * Handles all requests or operations regarding files.
  */
 public abstract class StorageModel {
-
-    /** The log.*/
-    private Logger log = LoggerFactory.getLogger(getClass());
-
-    /** The storage of checksums.*/
+    private final Logger log = LoggerFactory.getLogger(getClass());
     protected final ChecksumStore cache;
-    /** The file archives for the different collections. Can be null, if the pillar has no actual files 
-     * (e.g. ChecksumPillar). */
+    /**
+     * The file archives for the different collections. Can be null, if the pillar has no actual files
+     * (e.g. ChecksumPillar).
+     */
     protected FileStore fileArchive;
-    /** The default checksum specification.*/
     protected final ChecksumSpecTYPE defaultChecksumSpec;
-    /** The dispatcher of alarms.*/
     protected final AlarmDispatcher alarmDispatcher;
-    /** The settings.*/
     protected final Settings settings;
     protected final FileExchange fileExchange;
 
@@ -80,8 +74,8 @@ public abstract class StorageModel {
      * @param settings        The configuration to use.
      * @param fileExchange    The file exchange.
      */
-    protected StorageModel(FileStore archives, ChecksumStore cache, AlarmDispatcher alarmDispatcher,
-                           Settings settings, FileExchange fileExchange) {
+    protected StorageModel(FileStore archives, ChecksumStore cache, AlarmDispatcher alarmDispatcher, Settings settings,
+                           FileExchange fileExchange) {
         this.cache = cache;
         this.fileArchive = archives;
         this.alarmDispatcher = alarmDispatcher;
@@ -89,9 +83,10 @@ protected StorageModel(FileStore archives, ChecksumStore cache, AlarmDispatcher
         this.fileExchange = fileExchange;
         this.defaultChecksumSpec = ChecksumUtils.getDefault(settings);
     }
-    
+
     /**
      * Retrieval of the pillar id.
+     *
      * @return The id of the pillar.
      */
     public String getPillarID() {
@@ -101,38 +96,38 @@ public String getPillarID() {
     /**
      * Checks whether the pillar has an entry with the file-id for the given collection.
      * It will potentially verify that the actual file is consistent with the data in the cache.
-     * @param fileID The id of the file.
+     *
+     * @param fileID       The id of the file.
      * @param collectionID The id of the collection.
      * @return Whether the pillar has an entry for the file.
      */
     public boolean hasFileID(String fileID, String collectionID) {
-        if(cache.hasFile(fileID, collectionID)) {
+        if (cache.hasFile(fileID, collectionID)) {
             verifyFileToCacheConsistencyIfRequired(fileID, collectionID);
             return true;
-        } 
+        }
         return false;
     }
 
     /**
      * Retrieves the checksum for a given file at the given collection with the given checksum specification.
-     * If it is the default checksum specification, then the cached checksum is returned (though it might verify the 
+     * If it is the default checksum specification, then the cached checksum is returned (though it might verify the
      * consistency between the actual file and the cache before).
-     * If it otherwise requests a non-default checksum specification, then it will be handled differently for the 
+     * If it otherwise requests a non-default checksum specification, then it will be handled differently for the
      * Full ReferencePillar and the ChecksumPillar.
-     * The Full ReferencePillar will recalculated the default checksum for the file and updated in the database, along 
+     * The Full ReferencePillar will re-calculated the default checksum for the file and updated in the database, along
      * with calculating the new checksum specification for the file which will be returned.
-     * 
-     * @param fileID The id of the file whose checksum is requested.
+     *
+     * @param fileID       The id of the file whose checksum is requested.
      * @param collectionID The id of the collection of the file.
-     * @param csType The type of checksum.
+     * @param csType       The type of checksum.
      * @return The requested type of checksum for the given file.
      * @throws RequestHandlerException If a non-default checksum is requested for a checksum-pillar.
      */
-    public String getChecksumForFile(String fileID, String collectionID, ChecksumSpecTYPE csType) 
-            throws RequestHandlerException {
-        if(csType.equals(defaultChecksumSpec)) {
+    public String getChecksumForFile(String fileID, String collectionID, ChecksumSpecTYPE csType) throws RequestHandlerException {
+        if (csType.equals(defaultChecksumSpec)) {
             verifyFileToCacheConsistencyIfRequired(fileID, collectionID);
-            return cache.getChecksum(fileID, collectionID);            
+            return cache.getChecksum(fileID, collectionID);
         } else {
             return getNonDefaultChecksum(fileID, collectionID, csType);
         }
@@ -140,21 +135,20 @@ public String getChecksumForFile(String fileID, String collectionID, ChecksumSpe
 
     /**
      * Retrieves the checksum entry for a given file at the given collection with the given checksum specification.
-     * If it is the default checksum specification, then the entry in the case is returned (though it might verify the 
+     * If it is the default checksum specification, then the entry in the case is returned (though it might verify the
      * consistency between the actual file and the cache before).
-     * If it otherwise requests a non-default checksum specification, then it will be handled differently for the 
+     * If it otherwise requests a non-default checksum specification, then it will be handled differently for the
      * Full ReferencePillar and the ChecksumPillar.
-     * 
-     * @param fileID The id of the file whose checksum is requested.
+     *
+     * @param fileID       The id of the file whose checksum is requested.
      * @param collectionID The id of the collection of the file.
-     * @param csType The type of checksum.
-     * @return The entry for the requested type of checksum for the given file.
-     * @return {@link RequestHandlerException} If a non-default checksum is requested from a ChecksumPillar.
-     * @throws RequestHandlerException FIXME
+     * @param csType       The type of checksum.
+     * @return The {@link ChecksumEntry} for the requested type of checksum for the given file.
+     * @throws RequestHandlerException If an error occurs when trying to compute a non-default checksum.
      */
     public ChecksumEntry getChecksumEntryForFile(String fileID, String collectionID, ChecksumSpecTYPE csType)
             throws RequestHandlerException {
-        if(csType.equals(defaultChecksumSpec)) {
+        if (csType.equals(defaultChecksumSpec)) {
             verifyFileToCacheConsistencyIfRequired(fileID, collectionID);
             return cache.getEntry(fileID, collectionID);
         } else {
@@ -165,9 +159,10 @@ public ChecksumEntry getChecksumEntryForFile(String fileID, String collectionID,
 
     /**
      * Retrieves the entry for a given file with a given checksumSpec in the ChecksumDataForFileTYPE format.
-     * @param fileID The id of the file to retrieve the data from.
+     *
+     * @param fileID       The id of the file to retrieve the data from.
      * @param collectionID The id of the collection of the file.
-     * @param csType The type of checksum to calculate.
+     * @param csType       The type of checksum to calculate.
      * @return The entry encapsulated in the ChecksumDataForFileTYPE data format.
      * @throws RequestHandlerException If an issue occurs when retrieving the checksum for the file.
      */
@@ -180,80 +175,85 @@ public ChecksumDataForFileTYPE getChecksumDataForFile(String fileID, String coll
         res.setChecksumValue(Base16Utils.encodeBase16(entry.getChecksum()));
         return res;
     }
-    
+
     /**
-     * Ensures, that all files are up to date, and retrieves the requested entries.
+     * Ensures, that all files are up-to-date, and retrieves the requested entries.
+     *
      * @param minTimestamp The minimum date for the timestamp of the extracted checksum entries.
      * @param maxTimestamp The maximum date for the timestamp of the extracted checksum entries.
-     * @param maxResults The maximum number of results.
+     * @param maxResults   The maximum number of results.
      * @param collectionID The id of the collection.
-     * @param csSpec The checksum specification.
-     * @return If default checksum, then the checksum entries from the store. Otherwise calculate all the requested
+     * @param csSpec       The checksum specification.
+     * @return If default checksum, then the checksum entries from the store. Otherwise, calculate all the requested
      * checksums.
      * @throws RequestHandlerException If it is a non-default checksum specification, which is not supported (e.g. if
-     * it is a ChecksumPillar).
+     *                                 it is a ChecksumPillar).
      */
-    public ExtractedChecksumResultSet getChecksumResultSet(XMLGregorianCalendar minTimestamp, 
-            XMLGregorianCalendar maxTimestamp, Long maxResults, String collectionID, ChecksumSpecTYPE csSpec) 
-                    throws RequestHandlerException {
+    public ExtractedChecksumResultSet getChecksumResultSet(XMLGregorianCalendar minTimestamp, XMLGregorianCalendar maxTimestamp,
+                                                           Long maxResults, String collectionID, ChecksumSpecTYPE csSpec)
+            throws RequestHandlerException {
         verifyFileToCacheConsistencyOfAllDataIfRequired(collectionID);
-        if(csSpec.equals(defaultChecksumSpec)) {
+        if (csSpec.equals(defaultChecksumSpec)) {
             return cache.getChecksumResults(minTimestamp, maxTimestamp, maxResults, collectionID);
         } else {
-            log.info("Bulk-extraction of non-default checksums for spec: " + csSpec 
-                    + ", on collection " + collectionID + ", with maximum " + maxResults + " results.");
+            log.info(
+                    "Bulk-extraction of non-default checksums for spec: " + csSpec + ", on collection " + collectionID + ", with maximum " +
+                            maxResults + " results.");
             // We ignore minTimestamp and maxTimestamp when dealing with non-default checksums.
             return getNonDefaultChecksumResultSet(maxResults, collectionID, csSpec);
         }
     }
-    
+
     /**
      * Extracts the results set for a given checksum entry.
-     * If it has the file, but its calculation date is not within the timestamp restrictions, then an empty 
-     * resultset is returned.
-     * @param fileID The ID of the file.
+     * If it has the file, but its calculation date is not within the timestamp restrictions, then an empty
+     * result-set is returned.
+     *
+     * @param fileID       The ID of the file.
      * @param collectionID The id of the collection.
      * @param minTimestamp Optional restrictions for the minimum timestamp for the checksum calculation date.
      * @param maxTimestamp Optional restrictions for the maximum timestamp for the checksum calculation date.
-     * @param csSpec The checksum specification.
+     * @param csSpec       The checksum specification.
      * @return The extracted checksum result set.
-     * @throws RequestHandlerException If it is not possible to extract the checksum result, e.g. due to unsupported 
-     * checksum specification.
+     * @throws RequestHandlerException If it is not possible to extract the checksum result, e.g. due to unsupported
+     *                                 checksum specification.
      */
-    public ExtractedChecksumResultSet getSingleChecksumResultSet(String fileID, String collectionID, 
-            XMLGregorianCalendar minTimestamp, XMLGregorianCalendar maxTimestamp, ChecksumSpecTYPE csSpec) 
-                    throws RequestHandlerException {
+    public ExtractedChecksumResultSet getSingleChecksumResultSet(String fileID, String collectionID, XMLGregorianCalendar minTimestamp,
+                                                                 XMLGregorianCalendar maxTimestamp, ChecksumSpecTYPE csSpec)
+            throws RequestHandlerException {
         ExtractedChecksumResultSet res = new ExtractedChecksumResultSet();
         ChecksumEntry entry = getChecksumEntryForFile(fileID, collectionID, csSpec);
-        if((minTimestamp == null || CalendarUtils.convertFromXMLGregorianCalendar(minTimestamp).getTime() 
-                <= entry.getCalculationDate().getTime()) && (maxTimestamp == null || 
-                CalendarUtils.convertFromXMLGregorianCalendar(maxTimestamp).getTime() 
-                >= entry.getCalculationDate().getTime())) {
+        if ((minTimestamp == null ||
+                CalendarUtils.convertFromXMLGregorianCalendar(minTimestamp).getTime() <= entry.getCalculationDate().getTime()) &&
+                (maxTimestamp == null ||
+                        CalendarUtils.convertFromXMLGregorianCalendar(maxTimestamp).getTime() >= entry.getCalculationDate().getTime())) {
             res.insertChecksumEntry(entry);
         }
         return res;
     }
-    
+
     /**
      * Removes the entry for the given file.
      * Both from the cache, and if an archive exists, then also removed/deprecated the actual file.
-     * @param fileID The id of the file to remove.
+     *
+     * @param fileID       The id of the file to remove.
      * @param collectionID The id of the collection of the file.
      */
     public void deleteFile(String fileID, String collectionID) {
-        if(fileArchive != null) {
+        if (fileArchive != null) {
             fileArchive.deleteFile(fileID, collectionID);
         }
         cache.deleteEntry(fileID, collectionID);
     }
-    
+
     /**
      * Ensuring that the file is not in tmpDir is only relevant, if the file-archives exists.
-     * @param fileID The id of the file to ensure not exist in tmpDir.
+     *
+     * @param fileID       The id of the file to ensure not exist in tmpDir.
      * @param collectionID The id of the collection
      */
     public void ensureFileNotInTmpDir(String fileID, String collectionID) {
-        if(fileArchive != null) {
+        if (fileArchive != null) {
             fileArchive.ensureFileNotInTmpDir(fileID, collectionID);
         }
     }
@@ -262,20 +262,18 @@ public void ensureFileNotInTmpDir(String fileID, String collectionID) {
      * Verifies the handling of a specific checksum algorithm.
      *
      * @param checksumSpec The checksum specification to verify.
-     * @param collectionID The ID for the collection.
      * @throws RequestHandlerException If the checksum specification is not supported.
      */
-    public void verifyChecksumAlgorithm(ChecksumSpecTYPE checksumSpec, String collectionID) 
-            throws RequestHandlerException{
-        if(checksumSpec == null) {
+    public void verifyChecksumAlgorithm(ChecksumSpecTYPE checksumSpec) throws RequestHandlerException {
+        if (checksumSpec == null) {
             return;
         }
-        
+
         // Validate against ChecksumPillar specific algorithm (if is a ChecksumPillar).
-        if(getChecksumPillarSpec() != null && !(getChecksumPillarSpec().equals(checksumSpec))) {
-            throw new InvalidMessageException(ResponseCode.REQUEST_NOT_SUPPORTED, "Cannot handle the checksum "
-                    + "specification '" + checksumSpec + "'.This checksum pillar can only handle '" 
-                    + getChecksumPillarSpec() + "'");
+        if (getChecksumPillarSpec() != null && !(getChecksumPillarSpec().equals(checksumSpec))) {
+            throw new InvalidMessageException(ResponseCode.REQUEST_NOT_SUPPORTED,
+                    "Cannot handle the checksum " + "specification '" + checksumSpec + "'.This checksum pillar can only handle '" +
+                            getChecksumPillarSpec() + "'");
         }
 
         try {
@@ -288,16 +286,16 @@ public void verifyChecksumAlgorithm(ChecksumSpecTYPE checksumSpec, String collec
     /**
      * Retrieves the ChecksumEntry for the given file in the given collection, where the checksum is calculated with the
      * non-default checksum specification.
-     * 
-     * @param fileID The id of the file.
+     *
+     * @param fileID       The id of the file.
      * @param collectionID The id of the collection.
-     * @param csType The non-defaults checksum specification.
+     * @param csType       The non-defaults checksum specification.
      * @return The requested checksum entry.
-     * @throws RequestHandlerException If the checksum specification cannot be handled (e.g. if this is a 
-     * ChecksumPillar). 
+     * @throws RequestHandlerException If the checksum specification cannot be handled (e.g. if this is a
+     *                                 ChecksumPillar).
      */
-    protected ChecksumEntry retrieveNonDefaultChecksumEntry(String fileID, String collectionID, 
-            ChecksumSpecTYPE csType) throws RequestHandlerException {
+    protected ChecksumEntry retrieveNonDefaultChecksumEntry(String fileID, String collectionID, ChecksumSpecTYPE csType)
+            throws RequestHandlerException {
         String checksum = getNonDefaultChecksum(fileID, collectionID, csType);
         return new ChecksumEntry(fileID, checksum, new Date());
     }
@@ -305,56 +303,61 @@ protected ChecksumEntry retrieveNonDefaultChecksumEntry(String fileID, String co
     /**
      * Retrieves the checksum specification, if it is a ChecksumPillar.
      * A Full ReferencePillar must return null here.
+     *
      * @return The checksum specification if it is a ChecksumPillar, otherwise it returns null.
      */
     public abstract ChecksumSpecTYPE getChecksumPillarSpec();
 
     /**
      * Verifies that there is enough space left for the given collection for a file with the given fileSize.
-     * @param fileSize The size for the file to have enough space left for.
+     *
+     * @param fileSize     The size for the file to have enough space left for.
      * @param collectionID The id of the collection.
      * @throws RequestHandlerException If it is not possible to store a file with the given size within the
-     * archive of the given collection. 
+     *                                 archive of the given collection.
      */
-    public abstract void verifyEnoughFreeSpaceLeftForFile(Long fileSize, String collectionID) 
-            throws RequestHandlerException;
+    public abstract void verifyEnoughFreeSpaceLeftForFile(Long fileSize, String collectionID) throws RequestHandlerException;
 
     /**
      * Handles the ReplaceFile operation.
-     * @param fileID The id of the file.
-     * @param collectionID The id of the collection.
-     * @param fileAddress The address to retrieve the file from.
+     *
+     * @param fileID             The id of the file.
+     * @param collectionID       The id of the collection.
+     * @param fileAddress        The address to retrieve the file from.
      * @param validationChecksum The expected checksum for the file (validate when it has been downloaded).
      * @throws RequestHandlerException If something goes wrong, e.g. the downloaded file does not have the expected
-     * checksum.
+     *                                 checksum.
      */
-    public abstract void replaceFile(String fileID, String collectionID, String fileAddress, 
-            ChecksumDataForFileTYPE validationChecksum) throws RequestHandlerException;
-    
+    public abstract void replaceFile(String fileID, String collectionID, String fileAddress, ChecksumDataForFileTYPE validationChecksum)
+            throws RequestHandlerException;
+
     /**
      * Handles the PutFile operation.
-     * @param fileID The id of the file.
-     * @param collectionID The id of the collection.
-     * @param fileAddress The address to retrieve the file from.
+     *
+     * @param fileID           The id of the file.
+     * @param collectionID     The id of the collection.
+     * @param fileAddress      The address to retrieve the file from.
      * @param expectedChecksum The expected checksum for the file (validate when it has been downloaded).
      * @throws RequestHandlerException If something goes wrong, e.g. the downloaded file does not have the expected
-     * checksum.
+     *                                 checksum.
      */
-    public abstract void putFile(String collectionID, String fileID, String fileAddress, 
-            ChecksumDataForFileTYPE expectedChecksum) throws RequestHandlerException;
+    public abstract void putFile(String collectionID, String fileID, String fileAddress, ChecksumDataForFileTYPE expectedChecksum)
+            throws RequestHandlerException;
 
     /**
-     * Verify the consistency between all the data in the file archive and in the cache, if it is required by the 
+     * Verify the consistency between all the data in the file archive and in the cache, if it is required by the
      * settings.
      * This will not be performed by ChecksumPillars, since they do not have file archive.
+     *
      * @param collectionID The id of the collection to verify the consistency for.
      */
     public abstract void verifyFileToCacheConsistencyOfAllDataIfRequired(String collectionID);
-    
+
     /**
      * Verify the consistency for a given file in the file archive and in the cache, if it is required by the settings.
      * This will not be performed by ChecksumPillars, since they do not have file archive.
-     * @param fileID The id of the file.
+     *
+     * @param fileID       The id of the file.
      * @param collectionID The id of the collection to verify the consistency for.
      */
     protected abstract void verifyFileToCacheConsistencyIfRequired(String fileID, String collectionID);
@@ -362,63 +365,68 @@ public abstract void putFile(String collectionID, String fileID, String fileAddr
     /**
      * Validates that all files in the cache is also in the archive, and that all files in the archive
      * is also in the cache.
+     *
      * @param collectionID The id of the collection where the data should be ensured.
      */
     public abstract void verifyFileToCacheConsistencyOfAllData(String collectionID);
 
     /**
-     * Retrieves the non-default checksum for a file, thus calculating the checksum of the file with the new 
+     * Retrieves the non-default checksum for a file, thus calculating the checksum of the file with the new
      * checksum specification.
      * It will also recalculate the default checksum and update the cache with it.
      * A ChecksumPillar will throw an exception, since it does not have the actual files to calculate checksums with.
-     * @param fileID The id of the file.
+     *
+     * @param fileID       The id of the file.
      * @param collectionID The id of the collection.
-     * @param csType The checksum specification to calculate the checksum with.
+     * @param csType       The checksum specification to calculate the checksum with.
      * @return The checksum of the file calculated with the given checksum specification.
      * @throws RequestHandlerException If it is a ChecksumPillar.
      */
     protected abstract String getNonDefaultChecksum(String fileID, String collectionID, ChecksumSpecTYPE csType)
             throws RequestHandlerException;
-    
+
     /**
      * Retrieves the FileInfo for the actual file.
      * Will throw an exception for the ChecksumPillar.
-     * @param fileID The id of the file.
+     *
+     * @param fileID       The id of the file.
      * @param collectionID The id of the collection.
      * @return The fileInfo for the file.
      * @throws RequestHandlerException If it is a ChecksumPillar.
      */
-    public abstract FileInfo getFileInfoForActualFile(String fileID, String collectionID) 
-            throws RequestHandlerException;
-    
+    public abstract FileInfo getFileInfoForActualFile(String fileID, String collectionID) throws RequestHandlerException;
+
     /**
      * Extracts a set of file ids according to the given restrictions.
-     * @param fileID The id of the file (thus only the id of a specific file).
+     *
+     * @param fileID       The id of the file (thus only the id of a specific file).
      * @param minTimestamp The minimum date for the LastModifiedDate of the files.
      * @param maxTimestamp The maximum date for the LastModifiedDate of the files.
-     * @param maxResults The maximum number of results.
+     * @param maxResults   The maximum number of results.
      * @param collectionID The id of the collection.
      * @return The extracted file ids.
      */
-    public abstract ExtractedFileIDsResultSet getFileIDsResultSet(String fileID, XMLGregorianCalendar minTimestamp, 
-            XMLGregorianCalendar maxTimestamp, Long maxResults, String collectionID);
-    
+    public abstract ExtractedFileIDsResultSet getFileIDsResultSet(String fileID, XMLGregorianCalendar minTimestamp,
+                                                                  XMLGregorianCalendar maxTimestamp, Long maxResults, String collectionID);
+
     /**
      * Retrieves the checksums with a non-default checksum specification for some files.
-     * @param maxResults The maximum number of results.
+     *
+     * @param maxResults   The maximum number of results.
      * @param collectionID The id of the collection.
-     * @param csSpec The checksum specification.
+     * @param csSpec       The checksum specification.
      * @return A set of checksum-results for the non-default checksum specification.
      * @throws RequestHandlerException If the non-default checksum specification is not supported, e.g. if it is a
-     * ChecksumPillar.
+     *                                 ChecksumPillar.
      */
-    protected abstract ExtractedChecksumResultSet getNonDefaultChecksumResultSet(Long maxResults, String collectionID, 
-            ChecksumSpecTYPE csSpec) throws RequestHandlerException;
+    protected abstract ExtractedChecksumResultSet getNonDefaultChecksumResultSet(Long maxResults, String collectionID,
+                                                                                 ChecksumSpecTYPE csSpec) throws RequestHandlerException;
 
     /**
      * Throws an exception unless the actual file exists and is available.
      * Thus the ChecksumPillar will always throw an exception.
-     * @param fileID The id of the file.
+     *
+     * @param fileID       The id of the file.
      * @param collectionID The id of the collection.
      * @throws RequestHandlerException If it is a ChecksumPillar, or if the file does not exist.
      */
@@ -429,7 +437,7 @@ protected abstract ExtractedChecksumResultSet getNonDefaultChecksumResultSet(Lon
      */
     public void close() {
         cache.close();
-        if(fileArchive != null) {
+        if (fileArchive != null) {
             fileArchive.close();
         }
     }
diff --git a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/checksumdatabase/ChecksumDAO.java b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/checksumdatabase/ChecksumDAO.java
index 854879904..245cbd10a 100644
--- a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/checksumdatabase/ChecksumDAO.java
+++ b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/checksumdatabase/ChecksumDAO.java
@@ -5,62 +5,57 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.pillar.store.checksumdatabase;
 
-import java.util.Collection;
-import java.util.Date;
-import java.util.List;
-
-import javax.xml.datatype.XMLGregorianCalendar;
-
 import org.bitrepository.common.ArgumentValidator;
 import org.bitrepository.service.database.DBConnector;
 import org.bitrepository.service.database.DatabaseManager;
 
+import javax.xml.datatype.XMLGregorianCalendar;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+
 /**
  * The checksum store backed by a database.
  * Mediates the operations of the database to either the extractor or the ingestor.
  */
 public class ChecksumDAO implements ChecksumStore {
-    /** The ingestors for the database.*/
     private final ChecksumIngestor ingestor;
-    /** The extractor for the database.*/
     private final ChecksumExtractor extractor;
-    /** The connector for the database.*/
     private final DBConnector connector;
-    
+
     /**
-     * Constructor.
      * @param databaseManager The manager for the checksum database.
      */
     public ChecksumDAO(DatabaseManager databaseManager) {
-        synchronized(this) {
+        synchronized (this) {
             connector = databaseManager.getConnector();
             this.ingestor = new ChecksumIngestor(connector);
             this.extractor = new ChecksumExtractor(connector);
         }
     }
-    
+
     @Override
     public void insertChecksumCalculation(String fileID, String collectionID, String checksum, Date calculationDate) {
         ArgumentValidator.checkNotNull(fileID, "String fileID");
         ArgumentValidator.checkNotNull(collectionID, "String collectionID");
-        
-        if(extractor.hasFile(fileID, collectionID)) {
+
+        if (extractor.hasFile(fileID, collectionID)) {
             ingestor.updateEntry(fileID, collectionID, checksum, calculationDate);
         } else {
             ingestor.insertNewEntry(fileID, collectionID, checksum, calculationDate);
@@ -72,7 +67,7 @@ public void deleteEntry(String fileID, String collectionID) {
         ArgumentValidator.checkNotNull(fileID, "String fileID");
         ArgumentValidator.checkNotNull(collectionID, "String collectionID");
 
-        if(!extractor.hasFile(fileID, collectionID)) {
+        if (!extractor.hasFile(fileID, collectionID)) {
             throw new IllegalStateException("No entry for file '" + fileID + "' to delete.");
         }
         ingestor.removeEntry(fileID, collectionID);
@@ -82,33 +77,33 @@ public void deleteEntry(String fileID, String collectionID) {
     public ChecksumEntry getEntry(String fileID, String collectionID) {
         ArgumentValidator.checkNotNull(fileID, "String fileID");
         ArgumentValidator.checkNotNull(collectionID, "String collectionID");
-        
+
         return extractor.extractSingleEntry(fileID, collectionID);
     }
-    
+
     @Override
-    public ExtractedChecksumResultSet getChecksumResults(XMLGregorianCalendar minTimeStamp, 
-            XMLGregorianCalendar maxTimeStamp, Long maxNumberOfResults, String collectionID) {
+    public ExtractedChecksumResultSet getChecksumResults(XMLGregorianCalendar minTimeStamp,
+                                                         XMLGregorianCalendar maxTimeStamp, Long maxNumberOfResults, String collectionID) {
         ArgumentValidator.checkNotNull(collectionID, "String collectionID");
         return extractor.extractEntries(minTimeStamp, maxTimeStamp, maxNumberOfResults, collectionID);
     }
-    
+
     @Override
     public Date getCalculationDate(String fileID, String collectionID) {
         ArgumentValidator.checkNotNull(fileID, "String fileID");
         ArgumentValidator.checkNotNull(collectionID, "String collectionID");
 
         Date res = extractor.extractDateForFile(fileID, collectionID);
-        if(res == null) {
+        if (res == null) {
             throw new IllegalStateException("No entry for file '" + fileID + "' to delete.");
         }
         return res;
-        
+
     }
-    
+
     @Override
-    public ExtractedFileIDsResultSet getFileIDs(XMLGregorianCalendar minTimeStamp, XMLGregorianCalendar maxTimeStamp, 
-            Long maxNumberOfResults, String fileID, String collectionID) {
+    public ExtractedFileIDsResultSet getFileIDs(XMLGregorianCalendar minTimeStamp, XMLGregorianCalendar maxTimeStamp,
+                                                Long maxNumberOfResults, String fileID, String collectionID) {
         ArgumentValidator.checkNotNull(collectionID, "String collectionID");
         return extractor.getFileIDs(minTimeStamp, maxTimeStamp, maxNumberOfResults, fileID, collectionID);
     }
@@ -127,7 +122,7 @@ public String getChecksum(String fileID, String collectionID) {
         ArgumentValidator.checkNotNull(collectionID, "String collectionID");
 
         String res = extractor.extractChecksumForFile(fileID, collectionID);
-        if(res == null) {
+        if (res == null) {
             throw new IllegalStateException("No entry for file '" + fileID + "' to delete.");
         }
         return res;
@@ -145,12 +140,12 @@ public void close() {
     }
 
     @Override
-    public ExtractedChecksumResultSet getChecksumResult(XMLGregorianCalendar minTimeStamp, 
-            XMLGregorianCalendar maxTimeStamp, String fileID, String collectionID) {
-        ExtractedChecksumResultSet res = new ExtractedChecksumResultSet();        
-        ChecksumEntry entry = extractor.extractSingleEntryWithRestrictions(minTimeStamp, maxTimeStamp, fileID, 
+    public ExtractedChecksumResultSet getChecksumResult(XMLGregorianCalendar minTimeStamp,
+                                                        XMLGregorianCalendar maxTimeStamp, String fileID, String collectionID) {
+        ExtractedChecksumResultSet res = new ExtractedChecksumResultSet();
+        ChecksumEntry entry = extractor.extractSingleEntryWithRestrictions(minTimeStamp, maxTimeStamp, fileID,
                 collectionID);
-        if(entry != null) {
+        if (entry != null) {
             res.insertChecksumEntry(entry);
         }
         return res;
diff --git a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/checksumdatabase/ChecksumDBMigrator.java b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/checksumdatabase/ChecksumDBMigrator.java
index 42bed4cbf..8826ce4f3 100644
--- a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/checksumdatabase/ChecksumDBMigrator.java
+++ b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/checksumdatabase/ChecksumDBMigrator.java
@@ -5,24 +5,22 @@
  * Copyright (C) 2010 - 2013 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.pillar.store.checksumdatabase;
 
-import java.util.Map;
-
 import org.bitrepository.common.settings.Settings;
 import org.bitrepository.service.database.DBConnector;
 import org.bitrepository.service.database.DatabaseMigrator;
@@ -30,6 +28,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Map;
+
 import static org.bitrepository.pillar.store.checksumdatabase.DatabaseConstants.CHECKSUM_TABLE;
 import static org.bitrepository.pillar.store.checksumdatabase.DatabaseConstants.CS_COLLECTION_ID;
 
@@ -37,59 +37,60 @@
  * Migration class for the ChecksumDatabase of the ReferencePillar and ChecksumPillar.
  */
 public class ChecksumDBMigrator extends DatabaseMigrator {
-    /** The log.*/
     private static final Logger log = LoggerFactory.getLogger(DatabaseUtils.class);
-    /** The settings.*/
     private final Settings settings;
-    /** The current version of the database. */
     private final Integer currentVersion = 4;
-    /** The name of the update script for version 2 to 3.*/
+    /**
+     * The name of the update script for version 2 to 3.
+     */
     private static final String UPDATE_SCRIPT_VERSION_2_TO_3 = "sql/derby/checksumDB2to3Migration.sql";
-    /** The name of the update script for version 3 to 4.*/
+    /**
+     * The name of the update script for version 3 to 4.
+     */
     private static final String UPDATE_SCRIPT_VERSION_3_TO_4 = "sql/derby/checksumDB3to4Migration.sql";
-    
+
     /**
      * @param connector The connection to the database.
-     * @param settings The settings.
+     * @param settings  The settings.
      */
     public ChecksumDBMigrator(DBConnector connector, Settings settings) {
         super(connector);
         this.settings = settings;
     }
-    
+
     @Override
     public void migrate() {
         Map<String, Integer> versions = getTableVersions();
-        
-        if(!versions.containsKey(CHECKSUM_TABLE)) {
-            throw new IllegalStateException("The database does not contain '" + CHECKSUM_TABLE 
+
+        if (!versions.containsKey(CHECKSUM_TABLE)) {
+            throw new IllegalStateException("The database does not contain '" + CHECKSUM_TABLE
                     + "' table as required.");
         }
-        if(versions.get(CHECKSUM_TABLE) == 1) {
+        if (versions.get(CHECKSUM_TABLE) == 1) {
             migrateChecksumsTableFromVersion1To2();
         }
 
-        if(!versions.containsKey(CHECKSUM_TABLE) || versions.get(CHECKSUM_TABLE) < 3) {
+        if (!versions.containsKey(CHECKSUM_TABLE) || versions.get(CHECKSUM_TABLE) < 3) {
             log.warn("Migrating ChecksumDB from version 2 to 3.");
             migrateDerbyDatabase(UPDATE_SCRIPT_VERSION_2_TO_3);
         }
-        if(!versions.containsKey(CHECKSUM_TABLE) || versions.get(CHECKSUM_TABLE) < 4) {
+        if (!versions.containsKey(CHECKSUM_TABLE) || versions.get(CHECKSUM_TABLE) < 4) {
             log.warn("Migrating ChecksumDB from version 3 to 4.");
             migrateDerbyDatabase(UPDATE_SCRIPT_VERSION_3_TO_4);
         }
     }
-    
+
     /**
      * Migrate the ChecksumTable from version 1 to 2.
      * Just adds the column 'collectionid', which is set to the current (or first) collection id.
      */
     private void migrateChecksumsTableFromVersion1To2() {
         log.warn("Migrating the " + CHECKSUM_TABLE + " table from version 1 to 2 in the ChecksumDatabase.");
-        
+
         String alterSql = "ALTER TABLE " + CHECKSUM_TABLE + " ADD COLUMN " + CS_COLLECTION_ID + " VARCHAR(255)";
-        updateTable(CHECKSUM_TABLE, 2, alterSql, new Object[0]);
-        
-        String updateAfterwards = "UPDATE " + CHECKSUM_TABLE + " SET " + CS_COLLECTION_ID + " = ? WHERE " 
+        updateTable(CHECKSUM_TABLE, 2, alterSql);
+
+        String updateAfterwards = "UPDATE " + CHECKSUM_TABLE + " SET " + CS_COLLECTION_ID + " = ? WHERE "
                 + CS_COLLECTION_ID + " IS NULL";
         DatabaseUtils.executeStatement(connector, updateAfterwards, settings.getCollections().get(0).getID());
     }
@@ -97,12 +98,12 @@ private void migrateChecksumsTableFromVersion1To2() {
     @Override
     public boolean needsMigration() {
         Map<String, Integer> versions = getTableVersions();
-        
-        if(!versions.containsKey(CHECKSUM_TABLE)) {
-            throw new IllegalStateException("The database does not contain '" + CHECKSUM_TABLE 
+
+        if (!versions.containsKey(CHECKSUM_TABLE)) {
+            throw new IllegalStateException("The database does not contain '" + CHECKSUM_TABLE
                     + "' table as required.");
         }
-                
+
         return versions.get(CHECKSUM_TABLE) < currentVersion;
     }
 }
diff --git a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/checksumdatabase/ChecksumDatabaseManager.java b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/checksumdatabase/ChecksumDatabaseManager.java
index fb94adf48..0f59498e0 100644
--- a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/checksumdatabase/ChecksumDatabaseManager.java
+++ b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/checksumdatabase/ChecksumDatabaseManager.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2013 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -28,17 +28,16 @@
 import org.bitrepository.settings.referencesettings.DatabaseSpecifics;
 
 /**
- * Class to manage the connection to the Checksum database used in the reference and checksum pillars. 
+ * Class to manage the connection to the Checksum database used in the reference and checksum pillars.
  */
 public class ChecksumDatabaseManager extends DatabaseManager {
-
     private final Settings settings;
     private DatabaseMigrator migrator = null;
-    
+
     public ChecksumDatabaseManager(Settings settings) {
         this.settings = settings;
     }
-    
+
     @Override
     protected DatabaseSpecifics getDatabaseSpecifics() {
         return settings.getReferenceSettings().getPillarSettings().getChecksumDatabase();
@@ -46,7 +45,7 @@ protected DatabaseSpecifics getDatabaseSpecifics() {
 
     @Override
     protected synchronized DatabaseMigrator getMigrator() {
-        if(migrator == null) {
+        if (migrator == null) {
             migrator = new ChecksumDBMigrator(connector, settings);
         }
         return migrator;
diff --git a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/checksumdatabase/ChecksumEntry.java b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/checksumdatabase/ChecksumEntry.java
index 301d54278..97f8597f1 100644
--- a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/checksumdatabase/ChecksumEntry.java
+++ b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/checksumdatabase/ChecksumEntry.java
@@ -5,65 +5,61 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.pillar.store.checksumdatabase;
 
-import java.util.Date;
-
 import org.bitrepository.common.ArgumentValidator;
 
+import java.util.Date;
+
 /**
  * Container for the information about the checksum of a file.
  */
 public class ChecksumEntry {
-    /** The id of the file.*/
     protected final String fileID;
-    /** The checksum of the file.*/
     protected final String checksum;
-    /** The calculation date for the checksum of the file.*/
     protected final Date calculationDate;
-    
+
     /**
-     * Constructor.
-     * @param fileID The id of the file.
-     * @param checksum The checksum of the file.
+     * @param fileID          The id of the file.
+     * @param checksum        The checksum of the file.
      * @param calculationDate The calculation date for the checksum of the file.
      */
     public ChecksumEntry(String fileID, String checksum, Date calculationDate) {
         ArgumentValidator.checkNotNullOrEmpty(fileID, "String fileID");
-        
+
         this.fileID = fileID;
         this.checksum = checksum;
         this.calculationDate = new Date(calculationDate.getTime());
     }
-    
+
     /**
      * @return The id of the file.
      */
     public String getFileId() {
         return fileID;
     }
-    
+
     /**
      * @return The checksum of the file.
      */
     public String getChecksum() {
         return checksum;
     }
-    
+
     /**
      * @return The calculation date for the checksum of the file.
      */
diff --git a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/checksumdatabase/ChecksumExtractor.java b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/checksumdatabase/ChecksumExtractor.java
index 8b60f470a..c0d6a15f9 100644
--- a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/checksumdatabase/ChecksumExtractor.java
+++ b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/checksumdatabase/ChecksumExtractor.java
@@ -5,28 +5,30 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.pillar.store.checksumdatabase;
 
-import static org.bitrepository.pillar.store.checksumdatabase.DatabaseConstants.CHECKSUM_TABLE;
-import static org.bitrepository.pillar.store.checksumdatabase.DatabaseConstants.CS_CHECKSUM;
-import static org.bitrepository.pillar.store.checksumdatabase.DatabaseConstants.CS_COLLECTION_ID;
-import static org.bitrepository.pillar.store.checksumdatabase.DatabaseConstants.CS_DATE;
-import static org.bitrepository.pillar.store.checksumdatabase.DatabaseConstants.CS_FILE_ID;
+import org.bitrepository.common.ArgumentValidator;
+import org.bitrepository.common.utils.CalendarUtils;
+import org.bitrepository.service.database.DBConnector;
+import org.bitrepository.service.database.DatabaseUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+import javax.xml.datatype.XMLGregorianCalendar;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -35,99 +37,94 @@
 import java.util.Date;
 import java.util.List;
 
-import javax.xml.datatype.XMLGregorianCalendar;
-
-import org.bitrepository.common.ArgumentValidator;
-import org.bitrepository.common.utils.CalendarUtils;
-import org.bitrepository.service.database.DBConnector;
-import org.bitrepository.service.database.DatabaseUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import static org.bitrepository.pillar.store.checksumdatabase.DatabaseConstants.CHECKSUM_TABLE;
+import static org.bitrepository.pillar.store.checksumdatabase.DatabaseConstants.CS_CHECKSUM;
+import static org.bitrepository.pillar.store.checksumdatabase.DatabaseConstants.CS_COLLECTION_ID;
+import static org.bitrepository.pillar.store.checksumdatabase.DatabaseConstants.CS_DATE;
+import static org.bitrepository.pillar.store.checksumdatabase.DatabaseConstants.CS_FILE_ID;
 
 /**
  * Extracts data from the checksum database.
  */
 public class ChecksumExtractor {
-    /** The log.*/
     private final Logger log = LoggerFactory.getLogger(getClass());
-
-    /** The default amount of results to fetch out of the database for each call.*/
     protected static final int DEFAULT_FETCH_SIZE = 100;
-    
-    /** The connector for the database.*/
     private final DBConnector connector;
-    
+
     /**
-     * Constructor.
      * @param connector The connector for the database.
      */
     public ChecksumExtractor(DBConnector connector) {
         ArgumentValidator.checkNotNull(connector, "DBConnector connector");
-        
+
         this.connector = connector;
     }
-    
+
     /**
      * Extracts the date for a given file.
-     * @param fileID The id of the file to extract the date for.
+     *
+     * @param fileID       The id of the file to extract the date for.
      * @param collectionID The collection id for the file.
      * @return The date for the given file.
      */
     public Date extractDateForFile(String fileID, String collectionID) {
         ArgumentValidator.checkNotNullOrEmpty(fileID, "String fileID");
-        
-        String sql = "SELECT " + CS_DATE + " FROM " + CHECKSUM_TABLE + " WHERE " + CS_FILE_ID + " = ? AND " 
+
+        String sql = "SELECT " + CS_DATE + " FROM " + CHECKSUM_TABLE + " WHERE " + CS_FILE_ID + " = ? AND "
                 + CS_COLLECTION_ID + " = ?";
         Long dateInMillis = DatabaseUtils.selectFirstLongValue(connector, sql, fileID, collectionID);
-        if(dateInMillis == null) {
+        if (dateInMillis == null) {
             return null;
         }
         return new Date(dateInMillis);
     }
-    
+
     /**
      * Extracts the checksum for a given file.
-     * @param fileID The id of the file to extract the checksum for.
+     *
+     * @param fileID       The id of the file to extract the checksum for.
      * @param collectionID The collection id for the file.
      * @return The checksum for the given file.
      */
     public String extractChecksumForFile(String fileID, String collectionID) {
         ArgumentValidator.checkNotNullOrEmpty(fileID, "String fileID");
-        
-        String sql = "SELECT " + CS_CHECKSUM + " FROM " + CHECKSUM_TABLE + " WHERE " + CS_FILE_ID + " = ? AND " 
+
+        String sql = "SELECT " + CS_CHECKSUM + " FROM " + CHECKSUM_TABLE + " WHERE " + CS_FILE_ID + " = ? AND "
                 + CS_COLLECTION_ID + " = ?";
         return DatabaseUtils.selectStringValue(connector, sql, fileID, collectionID);
     }
-    
+
     /**
      * Extracts whether a given file exists.
-     * @param fileID The id of the file to extract whose existence is in question.
+     *
+     * @param fileID       The id of the file to extract whose existence is in question.
      * @param collectionID The collection id for the file.
      * @return Whether the given file exists.
      */
     public boolean hasFile(String fileID, String collectionID) {
         ArgumentValidator.checkNotNullOrEmpty(fileID, "String fileID");
 
-        String sql = "SELECT COUNT(*) FROM " + CHECKSUM_TABLE + " WHERE " + CS_FILE_ID + " = ? AND " 
+        String sql = "SELECT COUNT(*) FROM " + CHECKSUM_TABLE + " WHERE " + CS_FILE_ID + " = ? AND "
                 + CS_COLLECTION_ID + " = ?";
         return DatabaseUtils.selectIntValue(connector, sql, fileID, collectionID) != 0;
     }
-    
+
     /**
      * Extracts the checksum entry for a single file.
-     * @param fileID The id of the file whose checksum entry should be extracted.
+     *
+     * @param fileID       The id of the file whose checksum entry should be extracted.
      * @param collectionID The collection id for the extraction.
      * @return The checksum entry for the file.
      */
     public ChecksumEntry extractSingleEntry(String fileID, String collectionID) {
         ArgumentValidator.checkNotNullOrEmpty(fileID, "String fileID");
 
-        String sql = "SELECT " + CS_FILE_ID + " , " + CS_CHECKSUM + " , " + CS_DATE + " FROM " + CHECKSUM_TABLE 
+        String sql = "SELECT " + CS_FILE_ID + " , " + CS_CHECKSUM + " , " + CS_DATE + " FROM " + CHECKSUM_TABLE
                 + " WHERE " + CS_FILE_ID + " = ? AND " + CS_COLLECTION_ID + " = ?";
         try (Connection conn = connector.getConnection();
              PreparedStatement ps = DatabaseUtils.createPreparedStatement(conn, sql, fileID, collectionID)) {
             try (ResultSet res = ps.executeQuery()) {
-                if(!res.next()) {
+                if (!res.next()) {
                     throw new IllegalStateException("No entry for the file '" + fileID + "'.");
                 }
                 return extractChecksumEntry(res);
@@ -139,29 +136,30 @@ public ChecksumEntry extractSingleEntry(String fileID, String collectionID) {
 
     /**
      * Extracts the checksum entry for a single file, with restrictions on time interval.
+     *
      * @param minTimeStamp The minimum timestamp for the checksum calculation date.
      * @param maxTimeStamp The maximum timestamp for the checksum calculation date.
-     * @param fileID The id of the file.
+     * @param fileID       The id of the file.
      * @param collectionID The id of the collection.
      * @return The entry for the file, or null if it is not within the restrictions.
      */
-    public ChecksumEntry extractSingleEntryWithRestrictions(XMLGregorianCalendar minTimeStamp, 
-            XMLGregorianCalendar maxTimeStamp, String fileID, String collectionID) {
+    public ChecksumEntry extractSingleEntryWithRestrictions(XMLGregorianCalendar minTimeStamp,
+                                                            XMLGregorianCalendar maxTimeStamp, String fileID, String collectionID) {
         ArgumentValidator.checkNotNullOrEmpty(fileID, "String fileID");
 
         List<Object> args = new ArrayList<>();
         StringBuilder sql = new StringBuilder();
-        sql.append("SELECT " + CS_FILE_ID + " , " + CS_CHECKSUM + " , "  + CS_DATE + " FROM " + CHECKSUM_TABLE 
+        sql.append("SELECT " + CS_FILE_ID + " , " + CS_CHECKSUM + " , " + CS_DATE + " FROM " + CHECKSUM_TABLE
                 + " WHERE " + CS_FILE_ID + " = ? AND " + CS_COLLECTION_ID + " = ?");
 
         args.add(fileID);
         args.add(collectionID);
-        
-        if(minTimeStamp != null) {
+
+        if (minTimeStamp != null) {
             sql.append(" AND " + CS_DATE + " > ? ");
             args.add(CalendarUtils.convertFromXMLGregorianCalendar(minTimeStamp).getTime());
         }
-        if(maxTimeStamp != null) {
+        if (maxTimeStamp != null) {
             sql.append(" AND " + CS_DATE + " <= ? ");
             args.add(CalendarUtils.convertFromXMLGregorianCalendar(maxTimeStamp).getTime());
         }
@@ -170,13 +168,13 @@ public ChecksumEntry extractSingleEntryWithRestrictions(XMLGregorianCalendar min
         try (Connection conn = connector.getConnection();
              PreparedStatement ps = DatabaseUtils.createPreparedStatement(conn, sql.toString(), args.toArray())) {
             try (ResultSet res = ps.executeQuery()) {
-                if(!res.next()) {
+                if (!res.next()) {
                     log.debug("No checksum entry found for file '" + fileID + "' at collection '" + collectionID
                             + "', with calculation date interval: [" + minTimeStamp + " , " + maxTimeStamp + "]");
                     return null;
                 }
                 return extractChecksumEntry(res);
-            } 
+            }
         } catch (SQLException e) {
             throw new IllegalStateException("Cannot extract the ChecksumEntry for '" + fileID + "'", e);
         }
@@ -192,124 +190,125 @@ public ChecksumEntry extractSingleEntryWithRestrictions(XMLGregorianCalendar min
      * @param collectionID       The collection id for the extraction.
      * @return The requested collection of file ids.
      */
-    public ExtractedFileIDsResultSet getFileIDs(XMLGregorianCalendar minTimeStamp, XMLGregorianCalendar maxTimeStamp, 
-            Long maxNumberOfResults, String fileID, String collectionID) {
+    public ExtractedFileIDsResultSet getFileIDs(XMLGregorianCalendar minTimeStamp, XMLGregorianCalendar maxTimeStamp,
+                                                Long maxNumberOfResults, String fileID, String collectionID) {
         List<Object> args = new ArrayList<>();
         StringBuilder sql = new StringBuilder();
-        sql.append("SELECT " + CS_FILE_ID + " , " + CS_DATE + " FROM " + CHECKSUM_TABLE + " WHERE " 
+        sql.append("SELECT " + CS_FILE_ID + " , " + CS_DATE + " FROM " + CHECKSUM_TABLE + " WHERE "
                 + CS_COLLECTION_ID + " = ?");
         args.add(collectionID);
-        
-        if(minTimeStamp != null) {
+
+        if (minTimeStamp != null) {
             sql.append(" AND " + CS_DATE + " >= ? ");
             args.add(CalendarUtils.convertFromXMLGregorianCalendar(minTimeStamp).getTime());
         }
-        if(maxTimeStamp != null) {
+        if (maxTimeStamp != null) {
             sql.append(" AND " + CS_DATE + " <= ? ");
             args.add(CalendarUtils.convertFromXMLGregorianCalendar(maxTimeStamp).getTime());
         }
-        if(fileID != null) {
+        if (fileID != null) {
             sql.append(" AND " + CS_FILE_ID + " = ? ");
             args.add(fileID);
         }
         sql.append(" ORDER BY " + CS_DATE + " ASC ");
-        
+
         ExtractedFileIDsResultSet results = new ExtractedFileIDsResultSet();
         try (Connection conn = connector.getConnection();
-            PreparedStatement ps = DatabaseUtils.createPreparedStatement(conn, sql.toString(), args.toArray())){
+             PreparedStatement ps = DatabaseUtils.createPreparedStatement(conn, sql.toString(), args.toArray())) {
             conn.setAutoCommit(false);
             ps.setFetchSize(DEFAULT_FETCH_SIZE);
-            try (ResultSet res = ps.executeQuery()){
+            try (ResultSet res = ps.executeQuery()) {
                 int i = 0;
-                while(res.next() && (maxNumberOfResults == null || i < maxNumberOfResults)) {
-                    results.insertFileID(res.getString(DatabaseConstants.CS_FILE_ID), 
+                while (res.next() && (maxNumberOfResults == null || i < maxNumberOfResults)) {
+                    results.insertFileID(res.getString(DatabaseConstants.CS_FILE_ID),
                             new Date(res.getLong(DatabaseConstants.CS_DATE)));
                     i++;
                 }
-                
-                if(maxNumberOfResults != null && i >= maxNumberOfResults) {
+
+                if (maxNumberOfResults != null && i >= maxNumberOfResults) {
                     results.reportMoreEntriesFound();
                 }
             } finally {
                 conn.setAutoCommit(true);
             }
         } catch (SQLException e) {
-            throw new IllegalStateException("Cannot extract the file ids with the arguments, minTimestamp = '" 
-                    + minTimeStamp + "', maxTimestamp = '"+ maxTimeStamp + "', maxNumberOfResults = '" 
+            throw new IllegalStateException("Cannot extract the file ids with the arguments, minTimestamp = '"
+                    + minTimeStamp + "', maxTimestamp = '" + maxTimeStamp + "', maxNumberOfResults = '"
                     + maxNumberOfResults + "'", e);
         }
-        
+
         return results;
     }
-    
+
     /**
      * Retrieves all the file ids for a given collection id within the database.
+     *
      * @param collectionID The collection id for the extraction.
      * @return The list of file ids extracted from the database.
      */
     public List<String> extractAllFileIDs(String collectionID) {
-        String sql = "SELECT " + CS_FILE_ID + " FROM " + CHECKSUM_TABLE 
+        String sql = "SELECT " + CS_FILE_ID + " FROM " + CHECKSUM_TABLE
                 + " WHERE " + CS_COLLECTION_ID + " = ?";
         return DatabaseUtils.selectStringList(connector, sql, collectionID);
     }
-    
+
     /**
      * Extracts the checksum entries within the given optional limitations.
-     * 
-     * @param minTimeStamp The minimum date for the timestamp of the extracted checksum entries.
-     * @param maxTimeStamp The maximum date for the timestamp of the extracted checksum entries.
+     *
+     * @param minTimeStamp       The minimum date for the timestamp of the extracted checksum entries.
+     * @param maxTimeStamp       The maximum date for the timestamp of the extracted checksum entries.
      * @param maxNumberOfResults The maximum number of results.
-     * @param collectionID The collection id for the extraction.
+     * @param collectionID       The collection id for the extraction.
      * @return The requested collection of file ids.
      */
-    public ExtractedChecksumResultSet extractEntries(XMLGregorianCalendar minTimeStamp, 
-            XMLGregorianCalendar maxTimeStamp, Long maxNumberOfResults, String collectionID) {
+    public ExtractedChecksumResultSet extractEntries(XMLGregorianCalendar minTimeStamp,
+                                                     XMLGregorianCalendar maxTimeStamp, Long maxNumberOfResults, String collectionID) {
         List<Object> args = new ArrayList<>();
         StringBuilder sql = new StringBuilder();
-        sql.append("SELECT " + CS_FILE_ID + " , " + CS_CHECKSUM + " , " + CS_DATE + " FROM " + CHECKSUM_TABLE 
+        sql.append("SELECT " + CS_FILE_ID + " , " + CS_CHECKSUM + " , " + CS_DATE + " FROM " + CHECKSUM_TABLE
                 + " WHERE " + CS_COLLECTION_ID + " = ?");
         args.add(collectionID);
-        
-        if(minTimeStamp != null) {
+
+        if (minTimeStamp != null) {
             sql.append(" AND " + CS_DATE + " >= ? ");
             args.add(CalendarUtils.convertFromXMLGregorianCalendar(minTimeStamp).getTime());
         }
-        if(maxTimeStamp != null) {
+        if (maxTimeStamp != null) {
             sql.append(" AND " + CS_DATE + " <= ? ");
             args.add(CalendarUtils.convertFromXMLGregorianCalendar(maxTimeStamp).getTime());
         }
         sql.append(" ORDER BY " + CS_DATE + " ASC ");
-        
+
         ExtractedChecksumResultSet results = new ExtractedChecksumResultSet();
         try (Connection conn = connector.getConnection();
-             PreparedStatement ps = DatabaseUtils.createPreparedStatement(conn, sql.toString(), args.toArray())){
+             PreparedStatement ps = DatabaseUtils.createPreparedStatement(conn, sql.toString(), args.toArray())) {
             conn.setAutoCommit(false);
             ps.setFetchSize(DEFAULT_FETCH_SIZE);
             try (ResultSet res = ps.executeQuery()) {
                 int i = 0;
-                while(res.next() && (maxNumberOfResults == null || i < maxNumberOfResults)) {
+                while (res.next() && (maxNumberOfResults == null || i < maxNumberOfResults)) {
                     results.insertChecksumEntry(extractChecksumEntry(res));
                     i++;
                 }
-                
-                if(maxNumberOfResults != null && i >= maxNumberOfResults) {
+
+                if (maxNumberOfResults != null && i >= maxNumberOfResults) {
                     results.reportMoreEntriesFound();
                 }
             } finally {
                 conn.setAutoCommit(true);
             }
         } catch (SQLException e) {
-            throw new IllegalStateException("Cannot extract the checksum entries with the arguments, minTimestamp = '" 
-                    + minTimeStamp + "', maxTimestamp = '"+ maxTimeStamp + "', maxNumberOfResults = '" 
+            throw new IllegalStateException("Cannot extract the checksum entries with the arguments, minTimestamp = '"
+                    + minTimeStamp + "', maxTimestamp = '" + maxTimeStamp + "', maxNumberOfResults = '"
                     + maxNumberOfResults + "'", e);
         }
-        
+
         return results;
     }
-    
+
     /**
      * Extracts the file ids of the entries where the checksum calculation date is lower than a given date.
-     * 
+     *
      * @param maxTimeStamp The maximum date for the checksum calculation date.
      * @param collectionID The collection id for the extraction.
      * @return The requested collection of file ids.
@@ -320,7 +319,7 @@ public List<String> extractFileIDsWithMaxChecksumDate(Long maxTimeStamp, String
         List<Object> args = new ArrayList<>();
         args.add(collectionID);
         args.add(maxTimeStamp);
-        
+
         List<String> results = new ArrayList<>();
         String sql = "SELECT " + CS_FILE_ID + " FROM " + CHECKSUM_TABLE + " WHERE " + CS_COLLECTION_ID + " = ? AND "
                 + CS_DATE + " <= ? " + " ORDER BY " + CS_DATE + " ASC ";
@@ -329,8 +328,8 @@ public List<String> extractFileIDsWithMaxChecksumDate(Long maxTimeStamp, String
             conn.setAutoCommit(false);
             ps.setFetchSize(DEFAULT_FETCH_SIZE);
             try (ResultSet res = ps.executeQuery()) {
-                while(res.next() ) {
-                    if(!res.wasNull()) {
+                while (res.next()) {
+                    if (!res.wasNull()) {
                         results.add(res.getString(DatabaseConstants.CS_FILE_ID));
                     }
                 }
@@ -341,18 +340,18 @@ public List<String> extractFileIDsWithMaxChecksumDate(Long maxTimeStamp, String
             throw new IllegalStateException("Cannot extract the checksum entries with the arguments, maxTimestamp = '"
                     + maxTimeStamp + "'", e);
         }
-        
+
         return results;
     }
-    
+
     /**
-     * Extracts a checksum entry from a result set. 
+     * Extracts a checksum entry from a result set.
      * The result set needs to have requested the elements in the right order:
-     *  - File id.
-     *  - Checksum.
-     *  - Date.
-     * 
-     * @param resSet The resultset from the database.
+     * - File id.
+     * - Checksum.
+     * - Date.
+     *
+     * @param resSet The resultSet from the database.
      * @return The checksum entry extracted from the result set.
      */
     private ChecksumEntry extractChecksumEntry(ResultSet resSet) throws SQLException {
diff --git a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/checksumdatabase/ChecksumIngestor.java b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/checksumdatabase/ChecksumIngestor.java
index 43c599d74..3b65b4e8b 100644
--- a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/checksumdatabase/ChecksumIngestor.java
+++ b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/checksumdatabase/ChecksumIngestor.java
@@ -5,84 +5,85 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.pillar.store.checksumdatabase;
 
+import org.bitrepository.common.ArgumentValidator;
+import org.bitrepository.service.database.DBConnector;
+import org.bitrepository.service.database.DatabaseUtils;
+
+import java.util.Date;
+
 import static org.bitrepository.pillar.store.checksumdatabase.DatabaseConstants.CHECKSUM_TABLE;
 import static org.bitrepository.pillar.store.checksumdatabase.DatabaseConstants.CS_CHECKSUM;
 import static org.bitrepository.pillar.store.checksumdatabase.DatabaseConstants.CS_COLLECTION_ID;
 import static org.bitrepository.pillar.store.checksumdatabase.DatabaseConstants.CS_DATE;
 import static org.bitrepository.pillar.store.checksumdatabase.DatabaseConstants.CS_FILE_ID;
 
-import java.util.Date;
-
-import org.bitrepository.common.ArgumentValidator;
-import org.bitrepository.service.database.DBConnector;
-import org.bitrepository.service.database.DatabaseUtils;
-
 /**
  * Ingests data to the checksum database. And also deals with the deletion of entries.
  */
 public class ChecksumIngestor {
-    /** The connector for the database.*/
     private final DBConnector connector;
-    
+
     /**
-     * Constructor.
      * @param connector The connector for the database.
      */
     public ChecksumIngestor(DBConnector connector) {
         ArgumentValidator.checkNotNull(connector, "DBConnector connector");
-        
+
         this.connector = connector;
     }
-    
+
     /**
      * Inserts a new entry into the database.
-     * @param fileID The id of the file for the entry.
+     *
+     * @param fileID       The id of the file for the entry.
      * @param collectionID The id of the collection of the file.
-     * @param checksum The checksum of the file.
-     * @param date The calculation timestamp for the file.
+     * @param checksum     The checksum of the file.
+     * @param date         The calculation timestamp for the file.
      */
     public synchronized void insertNewEntry(String fileID, String collectionID, String checksum, Date date) {
-        String sql = "INSERT INTO " + CHECKSUM_TABLE + " ( " + CS_FILE_ID + " , " 
+        String sql = "INSERT INTO " + CHECKSUM_TABLE + " ( " + CS_FILE_ID + " , "
                 + CS_CHECKSUM + " , " + CS_DATE + " , " + CS_COLLECTION_ID + " ) VALUES ( ? , ? , ? , ? )";
         DatabaseUtils.executeStatement(connector, sql, fileID, checksum, date.getTime(), collectionID);
     }
-    
+
     /**
      * Updates an existing entry in the database.
-     * @param fileID The id of the file to update.
+     *
+     * @param fileID       The id of the file to update.
      * @param collectionID The id of the collection of the file.
-     * @param checksum The new checksum for the file.
-     * @param date The new date for the calculation of the checksum of the file.
+     * @param checksum     The new checksum for the file.
+     * @param date         The new date for the calculation of the checksum of the file.
      */
     public void updateEntry(String fileID, String collectionID, String checksum, Date date) {
-        String sql = "UPDATE " + CHECKSUM_TABLE + " SET " + CS_CHECKSUM + " = ? , " + CS_DATE + " = ? WHERE " 
+        String sql = "UPDATE " + CHECKSUM_TABLE + " SET " + CS_CHECKSUM + " = ? , " + CS_DATE + " = ? WHERE "
                 + CS_FILE_ID + " = ? AND " + CS_COLLECTION_ID + " = ?";
         DatabaseUtils.executeStatement(connector, sql, checksum, date.getTime(), fileID, collectionID);
     }
-    
+
     /**
      * Removes an entry from the database.
-     * @param fileID The id of the file whose entry should be removed.
+     *
+     * @param fileID       The id of the file whose entry should be removed.
      * @param collectionID The id of the collection of the file.
      */
     public void removeEntry(String fileID, String collectionID) {
-        String sql = "DELETE FROM " + CHECKSUM_TABLE + " WHERE " + CS_FILE_ID + " = ? AND " 
+        String sql = "DELETE FROM " + CHECKSUM_TABLE + " WHERE " + CS_FILE_ID + " = ? AND "
                 + CS_COLLECTION_ID + " = ?";
         DatabaseUtils.executeStatement(connector, sql, fileID, collectionID);
     }
diff --git a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/checksumdatabase/ChecksumStore.java b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/checksumdatabase/ChecksumStore.java
index f1ae65881..1b117089b 100644
--- a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/checksumdatabase/ChecksumStore.java
+++ b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/checksumdatabase/ChecksumStore.java
@@ -5,128 +5,137 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.pillar.store.checksumdatabase;
 
+import javax.xml.datatype.XMLGregorianCalendar;
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
 
-import javax.xml.datatype.XMLGregorianCalendar;
-
 /**
  * Interface for the storage of checksums.
  */
 public interface ChecksumStore {
     /**
      * Retrieve the calculation date for the checksum of the file.
-     * @param fileID The id of the file.
+     *
+     * @param fileID       The id of the file.
      * @param collectionID The id of the collection for the file.
      * @return The calculation date for the checksum of the file at the collection.
      */
     Date getCalculationDate(String fileID, String collectionID);
-    
+
     /**
      * Retrieve the checksum for the given file.
-     * @param fileID The id of the file.
+     *
+     * @param fileID       The id of the file.
      * @param collectionID The id of the collection for the file.
      * @return The checksum of the file.
      */
     String getChecksum(String fileID, String collectionID);
-    
+
     /**
-     * @param fileID The id of the file.
+     * @param fileID       The id of the file.
      * @param collectionID The id of the collection for the file.
      * @return The entry with the checksum information about the file.
      */
     ChecksumEntry getEntry(String fileID, String collectionID);
-    
+
     /**
      * Retrieves the checksum result entries for the given restrictions from the store.
-     * @param minTimeStamp The minimum date for the timestamp of the extracted checksum entries.
-     * @param maxTimeStamp The maximum date for the timestamp of the extracted checksum entries.
+     *
+     * @param minTimeStamp       The minimum date for the timestamp of the extracted checksum entries.
+     * @param maxTimeStamp       The maximum date for the timestamp of the extracted checksum entries.
      * @param maxNumberOfResults The maximum number of results.
-     * @param collectionID The id of the collection for the files.
+     * @param collectionID       The id of the collection for the files.
      * @return The checksum entries from the store.
      */
-    ExtractedChecksumResultSet getChecksumResults(XMLGregorianCalendar minTimeStamp, XMLGregorianCalendar maxTimeStamp, 
-            Long maxNumberOfResults, String collectionID);
+    ExtractedChecksumResultSet getChecksumResults(XMLGregorianCalendar minTimeStamp, XMLGregorianCalendar maxTimeStamp,
+                                                  Long maxNumberOfResults, String collectionID);
 
     /**
      * Retrieves the checksum result entry for the given file from the store.
+     *
      * @param minTimeStamp The minimum date for the timestamp of the extracted checksum entry.
      * @param maxTimeStamp The maximum date for the timestamp of the extracted checksum entry.
-     * @param fileID The id of the file to retrieve the checksum result for.
+     * @param fileID       The id of the file to retrieve the checksum result for.
      * @param collectionID The id of the collection for the file.
      * @return The checksum entries from the store.
      */
     ExtractedChecksumResultSet getChecksumResult(XMLGregorianCalendar minTimeStamp, XMLGregorianCalendar maxTimeStamp,
-            String fileID, String collectionID);
+                                                 String fileID, String collectionID);
 
     /**
      * Inserts a checksum calculation for a given file.
-     * @param fileID The id of the file.
-     * @param collectionID The id of the collection for the file.
-     * @param checksum The checksum of the file.
+     *
+     * @param fileID          The id of the file.
+     * @param collectionID    The id of the collection for the file.
+     * @param checksum        The checksum of the file.
      * @param calculationDate The date for the calculation of the checksum for the file.
      */
     void insertChecksumCalculation(String fileID, String collectionID, String checksum, Date calculationDate);
-    
+
     /**
      * Retrieval of file ids.
-     * @param minTimeStamp The minimum date for the timestamp of the extracted file ids.
-     * @param maxTimeStamp The maximum date for the timestamp of the extracted file ids.
+     *
+     * @param minTimeStamp       The minimum date for the timestamp of the extracted file ids.
+     * @param maxTimeStamp       The maximum date for the timestamp of the extracted file ids.
      * @param maxNumberOfResults The maximum number of results.
-     * @param fileID The id of the file. If null or empty string, then all files.
-     * @param collectionID The id of the collection for the file.
+     * @param fileID             The id of the file. If null or empty string, then all files.
+     * @param collectionID       The id of the collection for the file.
      * @return The file ids in the store within the restrictions.
      */
-    ExtractedFileIDsResultSet getFileIDs(XMLGregorianCalendar minTimeStamp, XMLGregorianCalendar maxTimeStamp, 
-            Long maxNumberOfResults, String fileID, String collectionID);
-    
+    ExtractedFileIDsResultSet getFileIDs(XMLGregorianCalendar minTimeStamp, XMLGregorianCalendar maxTimeStamp,
+                                         Long maxNumberOfResults, String fileID, String collectionID);
+
     /**
      * Retrieval of all the file ids in the store.
+     *
      * @param collectionID The id of the collection for the files.
      * @return The collection of file ids in the store.
      */
     Collection<String> getAllFileIDs(String collectionID);
-    
+
     /**
      * Retrieval of the ids for the files where the checksum was calculated earlier than a certain date.
+     *
      * @param checksumDate The max calculation date for the checksums to retrieve.
      * @param collectionID The id of the collection for the files.
      * @return The collection of ids for the files with old checksums.
      */
     List<String> getFileIDsWithOldChecksums(Date checksumDate, String collectionID);
-    
+
     /**
      * Deletes a given entry from the cache.
-     * @param fileID The id of the file, whose entry should be removed from the cache.
+     *
+     * @param fileID       The id of the file, whose entry should be removed from the cache.
      * @param collectionID The id of the collection for the file.
      */
     void deleteEntry(String fileID, String collectionID);
-    
+
     /**
      * Tells whether a given file id can be found in the cache.
-     * @param fileID The id of the file to find in the cache.
+     *
+     * @param fileID       The id of the file to find in the cache.
      * @param collectionID The id of the collection for the file.
      * @return Whether the file could be found.
      */
     boolean hasFile(String fileID, String collectionID);
-    
+
     /**
      * Closes and cleans up the ChecksumStore.
      */
diff --git a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/checksumdatabase/DatabaseConstants.java b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/checksumdatabase/DatabaseConstants.java
index 41be6db08..1989c03d7 100644
--- a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/checksumdatabase/DatabaseConstants.java
+++ b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/checksumdatabase/DatabaseConstants.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -25,21 +25,31 @@
  * Container for the constants for the checksum database.
  */
 public final class DatabaseConstants {
-    /** Private constructor to prevent instantiation of this constant container.*/
-    private DatabaseConstants() {}
-    
-    /** The table with the checksum entries.*/
+    /**
+     * The table with the checksum entries.
+     */
     public static final String CHECKSUM_TABLE = "checksums";
-    /** The column for the id of file.*/
+    /**
+     * The column for the id of file.
+     */
     public static final String CS_FILE_ID = "fileid";
-    /** The column for the checksum of the file.*/
+    /**
+     * The column for the checksum of the file.
+     */
     public static final String CS_CHECKSUM = "checksum";
-    /** The column for the date for the calculation of the checksum.*/
+    /**
+     * The column for the date for the calculation of the checksum.
+     */
     public static final String CS_DATE = "calculationdate";
-    /** The column for the collection id for the file.*/
+    /**
+     * The column for the collection id for the file.
+     */
     public static final String CS_COLLECTION_ID = "collectionid";
-    
-    /** The column for the guid of the entry.*/
+
+    /**
+     * The column for the guid of the entry.
+     */
     public static final String CS_GUID = "guid";
-    
+
+    private DatabaseConstants() {}
 }
diff --git a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/checksumdatabase/ExtractedChecksumResultSet.java b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/checksumdatabase/ExtractedChecksumResultSet.java
index 4c25340b9..247d524ff 100644
--- a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/checksumdatabase/ExtractedChecksumResultSet.java
+++ b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/checksumdatabase/ExtractedChecksumResultSet.java
@@ -5,56 +5,53 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.pillar.store.checksumdatabase;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.bitrepository.bitrepositoryelements.ChecksumDataForChecksumSpecTYPE;
 import org.bitrepository.common.utils.Base16Utils;
 import org.bitrepository.common.utils.CalendarUtils;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
- * Container of the results of a checksum database exctraction.
+ * Container of the results of a checksum database extraction.
  */
 public class ExtractedChecksumResultSet {
-    /** The list of checksum entries.*/
     protected final List<ChecksumDataForChecksumSpecTYPE> entries;
-    /** Whether more results has been found.*/
     protected boolean moreEntriesReported;
-    
-    /**
-     * Constructor.
-     */
+
     public ExtractedChecksumResultSet() {
         entries = new ArrayList<>();
         moreEntriesReported = false;
     }
-    
+
     /**
-     * Adds an entry to this result set. 
+     * Adds an entry to this result set.
+     *
      * @param entry The entry to add.
      */
     public void insertChecksumEntry(ChecksumDataForChecksumSpecTYPE entry) {
         entries.add(entry);
     }
-    
+
     /**
-     * Adds an entry to this result set. 
+     * Adds an entry to this result set.
+     *
      * @param entry The entry to add.
      */
     public void insertChecksumEntry(ChecksumEntry entry) {
@@ -64,21 +61,21 @@ public void insertChecksumEntry(ChecksumEntry entry) {
         res.setFileID(entry.getFileId());
         entries.add(res);
     }
-    
+
     /**
      * @return A list with all the reported entries.
      */
     public List<ChecksumDataForChecksumSpecTYPE> getEntries() {
         return new ArrayList<>(entries);
     }
-    
+
     /**
-     * Set that more entries has been found. 
+     * Set that more entries has been found.
      */
     public void reportMoreEntriesFound() {
         moreEntriesReported = true;
     }
-    
+
     /**
      * @return Whether it has been reported, that more results exists.
      */
diff --git a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/checksumdatabase/ExtractedFileIDsResultSet.java b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/checksumdatabase/ExtractedFileIDsResultSet.java
index ca24fec7f..5cc4a9e70 100644
--- a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/checksumdatabase/ExtractedFileIDsResultSet.java
+++ b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/checksumdatabase/ExtractedFileIDsResultSet.java
@@ -5,74 +5,71 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.pillar.store.checksumdatabase;
 
-import java.math.BigInteger;
-import java.util.Date;
-
-import javax.xml.datatype.XMLGregorianCalendar;
-
 import org.bitrepository.bitrepositoryelements.FileIDsData;
 import org.bitrepository.bitrepositoryelements.FileIDsData.FileIDsDataItems;
 import org.bitrepository.bitrepositoryelements.FileIDsDataItem;
 import org.bitrepository.common.filestore.FileInfo;
 import org.bitrepository.common.utils.CalendarUtils;
 
+import javax.xml.datatype.XMLGregorianCalendar;
+import java.math.BigInteger;
+import java.util.Date;
+
 /**
- * Container of the results of a checksum database extraction for file ids. 
+ * Container of the results of a checksum database extraction for file ids.
  */
 public class ExtractedFileIDsResultSet {
-    /** The results of the file ids extraction.*/
     protected final FileIDsData results;
-    /** Whether more results has been found.*/
     protected boolean moreEntriesReported;
-    
-    /**
-     * Constructor.
-     */
+
     public ExtractedFileIDsResultSet() {
         results = new FileIDsData();
         results.setFileIDsDataItems(new FileIDsDataItems());
         moreEntriesReported = false;
     }
-    
+
     /**
-     * Adds a file id to this result set. 
-     * @param fileInfo The fileinfo for the file to insert.
+     * Adds a file id to this result set.
+     *
+     * @param fileInfo The file-info for the file to insert.
      */
     public void insertFileInfo(FileInfo fileInfo) {
-        insertFileID(fileInfo.getFileID(), BigInteger.valueOf(fileInfo.getSize()), 
+        insertFileID(fileInfo.getFileID(), BigInteger.valueOf(fileInfo.getSize()),
                 CalendarUtils.getFromMillis(fileInfo.getLastModifiedDate()));
     }
-    
+
     /**
      * Inserts a file id with date, but without the size.
      * Intended for the ChecksumPillar, which cannot deliver any size.
-     * @param fileID The id of the file.
+     *
+     * @param fileID       The id of the file.
      * @param lastModified The last modified timestamp.
      */
     public void insertFileID(String fileID, Date lastModified) {
         insertFileID(fileID, null, CalendarUtils.getXmlGregorianCalendar(lastModified));
     }
-    
+
     /**
-     * Adds a file id to this result set. 
-     * @param fileID The id of the file to add.
-     * @param size The size of the file.
+     * Adds a file id to this result set.
+     *
+     * @param fileID       The id of the file to add.
+     * @param size         The size of the file.
      * @param lastModified The last modified date for the file.
      */
     public void insertFileID(String fileID, BigInteger size, XMLGregorianCalendar lastModified) {
@@ -82,21 +79,21 @@ public void insertFileID(String fileID, BigInteger size, XMLGregorianCalendar la
         item.setLastModificationTime(lastModified);
         results.getFileIDsDataItems().getFileIDsDataItem().add(item);
     }
-    
+
     /**
      * @return The data results of the extraction.
      */
     public FileIDsData getEntries() {
         return results;
     }
-    
+
     /**
-     * Set that more entries has been found. 
+     * Set that more entries has been found.
      */
     public void reportMoreEntriesFound() {
         moreEntriesReported = true;
     }
-    
+
     /**
      * @return Whether it has been reported, that more results exists.
      */
diff --git a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/filearchive/ArchiveDirectory.java b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/filearchive/ArchiveDirectory.java
index 3d9c7339d..f98d350ae 100644
--- a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/filearchive/ArchiveDirectory.java
+++ b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/filearchive/ArchiveDirectory.java
@@ -5,63 +5,83 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.pillar.store.filearchive;
 
+import org.bitrepository.common.ArgumentValidator;
+import org.bitrepository.common.utils.FileUtils;
+
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-
-import org.bitrepository.common.ArgumentValidator;
-import org.bitrepository.common.utils.FileUtils;
+import java.util.Objects;
 
 /**
- * Manager interface for a given archival directory, with the subdirectories 'tempDir', 'fileDir', 'folderDir' 
+ * Manager interface for a given archival directory, with the subdirectories 'tempDir', 'fileDir', 'folderDir'
  * and 'retainDir'.
  * A new file is ingested into the 'tempDir', where it can be validated before it is moved to the actual archive.
- * Depending on whether the file-id contains a directory-structure path, then it is either moved to the 'fileDir' 
+ * Depending on whether the file-id contains a directory-structure path, then it is either moved to the 'fileDir'
  * or the 'folderDir'.
  * If a file is to be deleted, then it is moved from the 'fileDir' or 'folderDir' to the 'retainDir'.
  */
 public class ArchiveDirectory {
-    /** Constant for the temporary directory name.*/
+    /**
+     * Constant for the temporary directory name.
+     */
     public static final String TEMPORARY_DIR = "tmpDir";
-    /** Constant for the file archive name.*/
+    /**
+     * Constant for the file archive name.
+     */
     public static final String ARCHIVE_DIR = "fileDir";
-    /** Constant for the retain directory name.*/
+    /**
+     * Constant for the "retain" directory name.
+     */
     public static final String RETAIN_DIR = "retainDir";
-    /** The constant for the folder directory name.*/
+    /**
+     * The constant for the folder directory name.
+     */
     public static final String FOLDER_DIR = "folderDir";
-    
-    /** The directory for the files. Contains three sub directories: tempDir, fileDir and retainDir.*/
-    private File baseDepositDir;
 
-    /** The directory where files are being downloaded to before they are put into the filedir. */
-    private File tmpDir;
-    /** The directory where the files are being stored.*/
+    /**
+     * The directory for the files. Contains three subdirectories: tempDir, fileDir and retainDir.
+     */
+    private final File baseDepositDir;
+
+    /**
+     * The directory where files are being downloaded to before they are put into the fileDir.
+     */
+    private final File tmpDir;
+    /**
+     * The directory where the files are being stored.
+     */
     private final File fileDir;
-    /** The directory where the files are moved, when they are removed from the archive.*/
+    /**
+     * The directory where the files are moved, when they are removed from the archive.
+     */
     private final File retainDir;
-    /** The directory where the files where the file-id contains a directory-path are stored.*/
+    /**
+     * The directory where the files where the file-id contains a directory-path are stored.
+     */
     private final File folderDir;
+    private final Object lock = new Object();
 
-    /** 
-     * Constructor. Initialises the file directory. 
-     * 
+    /**
+     * Constructor. Initialises the file directory.
+     *
      * @param dirName The directory for this archive.
      */
     public ArchiveDirectory(String dirName) {
@@ -74,43 +94,46 @@ public ArchiveDirectory(String dirName) {
         retainDir = FileUtils.retrieveSubDirectory(baseDepositDir, RETAIN_DIR);
         folderDir = FileUtils.retrieveSubDirectory(baseDepositDir, FOLDER_DIR);
     }
-    
+
     /**
      * Retrieves the file for the given fileID, or returns a null, if no such file exists.
+     *
      * @param fileID The id of the file to retrieve.
      * @return The requested file, or a null if no such file exists.
      */
     public File retrieveFile(String fileID) {
         File res = getFile(fileID);
-        if(res.isFile()) {
+        if (res.isFile()) {
             return res;
         } else {
             return null;
         }
     }
-    
+
     /**
      * Method for retrieving the abstract file for the given fileID, no matter whether the actual file exists or not.
+     *
      * @param fileID The id of the file to retrieve.
      * @return The file.
      */
     protected File getFile(String fileID) {
-        if(isFolderFile(fileID)) {
+        if (isFolderFile(fileID)) {
             return new File(folderDir, fileID);
         } else {
             return new File(fileDir, fileID);
         }
     }
-    
+
     /**
      * Checks whether the fileID contains a directory-path, and thus should be placed in the folderDir.
+     *
      * @param fileID The fileID to check.
      * @return Whether the fileID contains a directory-path.
      */
     protected boolean isFolderFile(String fileID) {
         return fileID.contains(File.separator);
     }
-    
+
     /**
      * @param fileID The file id to test whether it exists.
      * @return Whether the given file exists within the archive.
@@ -118,53 +141,53 @@ protected boolean isFolderFile(String fileID) {
     public boolean hasFile(String fileID) {
         return getFile(fileID).isFile();
     }
-    
+
     /**
      * @return Retrieves the list of archived files.
      */
     public List<String> getFileIds() {
         List<String> res = new ArrayList<>();
-        res.addAll(Arrays.asList(fileDir.list()));
+        res.addAll(Arrays.asList(Objects.requireNonNull(fileDir.list())));
         res.addAll(getSubFolderFileIDs(folderDir, ""));
         return res;
     }
-    
+
     /**
      * @return The number of bytes left for the base directory.
      */
     public Long getBytesLeft() {
         return baseDepositDir.getFreeSpace();
     }
-    
+
     /**
      * @param fileID The id of the file
      * @return A new file in the temporary directory.
      */
     public File getFileInTempDir(String fileID) {
         File res = new File(tmpDir, fileID);
-        if(!res.exists()) {
+        if (!res.exists()) {
             throw new IllegalStateException("The file '" + fileID + "' does not exist within the tmpDir.");
         }
         return res;
     }
-    
+
     /**
      * @param fileID The id of the file
      * @return A new file in the temporary directory.
      */
     public File getNewFileInTempDir(String fileID) {
         File res = new File(tmpDir, fileID);
-        if(res.exists()) {
+        if (res.exists()) {
             throw new IllegalStateException("Cannot create a new file in the temporary directory.");
         }
-        if(!res.getParentFile().isDirectory()) {
-            synchronized(tmpDir) {
+        if (!res.getParentFile().isDirectory()) {
+            synchronized (tmpDir) {
                 FileUtils.retrieveDirectory(res.getParent());
             }
         }
         return res;
     }
-    
+
     /**
      * @param fileID The id of the file.
      * @return Whether a given file exist in the temporary directory.
@@ -172,85 +195,88 @@ public File getNewFileInTempDir(String fileID) {
     public boolean hasFileInTempDir(String fileID) {
         return new File(tmpDir, fileID).isFile();
     }
-    
+
     /**
      * Moves a file from the tmpDir to the archive dir.
+     *
      * @param fileID The id of the file to
      */
     public void moveFromTmpToArchive(String fileID) {
         File tmpFile = new File(tmpDir, fileID);
         File archiveFile = getFile(fileID);
-        
-        if(!tmpFile.isFile()) {
+
+        if (!tmpFile.isFile()) {
             throw new IllegalStateException("The file '" + fileID + "' does not exist within the tmpDir.");
         }
-        if(archiveFile.isFile()) {
+        if (archiveFile.isFile()) {
             throw new IllegalStateException("The file '" + fileID + "' does already exist within the fileDir.");
         }
-        
+
         // Move the file to the fileDir.
-        synchronized(folderDir) {
+        synchronized (folderDir) {
             FileUtils.moveFile(tmpFile, archiveFile);
         }
         cleanupDirs(fileID, tmpDir);
     }
-    
+
     /**
-     * The file to remove from the archive. The file is just moved from the fileDir to the retainDir. 
+     * The file to remove from the archive. The file is just moved from the fileDir to the retainDir.
+     *
      * @param fileID The id of the file to remove from archive.
      */
     public void removeFileFromArchive(String fileID) {
         File oldFile = getFile(fileID);
-        if(!oldFile.isFile()) {
-            throw new IllegalStateException("Cannot locate the file to delete '" + fileID + "' from location '"
-                    + oldFile.getAbsolutePath() + "'!");
+        if (!oldFile.isFile()) {
+            throw new IllegalStateException(
+                    "Cannot locate the file to delete '" + fileID + "' from location '" + oldFile.getAbsolutePath() + "'!");
         }
         File retainFile = new File(retainDir, fileID);
-        
+
         // If a version of the file already has been retained, then it should be deprecated.
-        if(retainFile.exists()) {
+        if (retainFile.exists()) {
             FileUtils.deprecateFile(retainFile);
         }
-        
+
         FileUtils.moveFile(oldFile, retainFile);
         cleanupDirs(fileID, folderDir);
     }
 
     /**
      * The file to remove from the temporary directory. The file is just moved from the fileDir to the retainDir.
-     * This should be used e.g. to clean up after a failed PutFile. 
+     * This should be used e.g. to clean up after a failed PutFile.
+     *
      * @param fileID The id of the file to remove from tmpdir.
      */
     public void removeFileFromTmp(String fileID) {
         File oldFile = new File(tmpDir, fileID);
-        if(!oldFile.isFile()) {
+        if (!oldFile.isFile()) {
             throw new IllegalStateException("Cannot locate the file to delete '" + oldFile.getAbsolutePath() + "'!");
         }
         File retainFile = new File(retainDir, fileID);
-        
+
         // If a version of the file already has been retained, then it should be deprecated.
         // If it does not exist, then it must be ensured that the parent folder exists. 
-        if(retainFile.exists()) {
+        if (retainFile.exists()) {
             FileUtils.deprecateFile(retainFile);
         }
-        
+
         FileUtils.moveFile(oldFile, retainFile);
         cleanupDirs(fileID, tmpDir);
     }
-    
+
     /**
-     * Retrieves the file-ids of the files within the subdirs of the folder-dir.
-     * It recursive goes through the sub-directories
-     * @param dir The current directory.
+     * Retrieves the file-ids of the files within the subdirectories of the folder-dir by recursively going through them.
+     *
+     * @param dir     The current directory.
      * @param dirPath The relative path to the current directory. Is used as prefix for the files in this folder.
      * @return The list of file-ids in the current folder and all the sub-folders.
      */
     protected List<String> getSubFolderFileIDs(File dir, String dirPath) {
         List<String> res = new ArrayList<>();
-        if(dir.list() != null) {
-            for(File f : dir.listFiles()) {
+        if (dir.list() != null) {
+            for (File f : Objects.requireNonNull(dir.listFiles())) {
                 String path = dirPath + f.getName();
-                if(f.isFile()) {
+                if (f.isFile()) {
                     res.add(path);
                 } else {
                     res.addAll(getSubFolderFileIDs(f, path + File.separator));
@@ -259,18 +285,19 @@ protected List<String> getSubFolderFileIDs(File dir, String dirPath) {
         }
         return res;
     }
-    
+
     /**
      * Cleanup directories after use.
      * Only removes empty directories.
-     * @param fileID The ID of the file.
+     *
+     * @param fileID  The ID of the file.
      * @param rootDir The root directory.
      */
     protected void cleanupDirs(String fileID, File rootDir) {
-        if(!isFolderFile(fileID)) {
+        if (!isFolderFile(fileID)) {
             return;
         }
-        synchronized(rootDir) {
+        synchronized (lock) {
             File origFile = new File(rootDir, fileID);
             FileUtils.cleanupEmptyDirectories(origFile.getParentFile(), rootDir);
         }
diff --git a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/filearchive/CollectionArchiveManager.java b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/filearchive/CollectionArchiveManager.java
index 49ecd0af1..f23570f65 100644
--- a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/filearchive/CollectionArchiveManager.java
+++ b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/filearchive/CollectionArchiveManager.java
@@ -5,22 +5,29 @@
  * Copyright (C) 2010 - 2013 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.pillar.store.filearchive;
 
+import org.bitrepository.common.filestore.DefaultFileInfo;
+import org.bitrepository.common.filestore.FileInfo;
+import org.bitrepository.common.filestore.FileStore;
+import org.bitrepository.common.settings.Settings;
+import org.bitrepository.common.utils.SettingsUtils;
+import org.bitrepository.settings.referencesettings.CollectionDirs;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -30,71 +37,62 @@
 import java.util.List;
 import java.util.Map;
 
-import org.bitrepository.common.filestore.DefaultFileInfo;
-import org.bitrepository.common.filestore.FileInfo;
-import org.bitrepository.common.filestore.FileStore;
-import org.bitrepository.common.settings.Settings;
-import org.bitrepository.common.utils.SettingsUtils;
-import org.bitrepository.settings.referencesettings.CollectionDirs;
-
 /**
  * The CollectionArchiveManager manages the archives of the different collections for the Pillar.
  */
 public class CollectionArchiveManager implements FileStore {
-    /** The mapping between the collections and their archives.*/
     private final Map<String, ReferenceArchive> archives = new HashMap<>();
-    
+
     /**
-     * Constructor.
      * @param settings The settings for the repository.
      */
     public CollectionArchiveManager(Settings settings) {
         initiateSpecificDirs(settings);
         initiateDefaultDirs(settings);
     }
-    
+
     /**
      * Initiates the specified archive directories.
+     *
      * @param settings The settings.
      */
     private void initiateSpecificDirs(Settings settings) {
-        for(CollectionDirs cd : settings.getReferenceSettings().getPillarSettings().getCollectionDirs()){
-            if(cd.getCollectionID().isEmpty()) {
-                continue;
-            } else {
+        for (CollectionDirs cd : settings.getReferenceSettings().getPillarSettings().getCollectionDirs()) {
+            if (!cd.getCollectionID().isEmpty()) {
                 initiateArchive(cd.getCollectionID(), cd.getFileDirs());
             }
-        }        
+        }
     }
-    
+
     /**
      * Initiates the default archive directories.
      * These will only be used for the collections, which does not have a specified directory.
+     *
      * @param settings The settings.
      */
     private void initiateDefaultDirs(Settings settings) {
-        for(CollectionDirs cd : settings.getReferenceSettings().getPillarSettings().getCollectionDirs()){
-            if(cd.getCollectionID().isEmpty()) {
-                initiateArchive(SettingsUtils.getCollectionIDsForPillar(settings.getComponentID()),
-                        cd.getFileDirs());
+        for (CollectionDirs cd : settings.getReferenceSettings().getPillarSettings().getCollectionDirs()) {
+            if (cd.getCollectionID().isEmpty()) {
+                initiateArchive(SettingsUtils.getCollectionIDsForPillar(settings.getComponentID()), cd.getFileDirs());
             }
-        }        
+        }
     }
-    
+
     /**
      * Initiates the archives for a set of collection ids and their respective directory paths.
-     * Only creates archives for the collection, if it does not already has one.
+     * Only creates archives for the collection, if it does not already have one.
+     *
      * @param collectionIDs The ids of the collections.
-     * @param fileDirs The paths to the directories.
+     * @param fileDirs      The paths to the directories.
      */
     private void initiateArchive(Collection<String> collectionIDs, Collection<String> fileDirs) {
-        for(String colId : collectionIDs) {
+        for (String colId : collectionIDs) {
             List<String> dirs = new ArrayList<>();
-            for(String dir : fileDirs) {
+            for (String dir : fileDirs) {
                 dirs.add(new File(dir, colId).getPath());
             }
-            
-            if(!archives.containsKey(colId)) {
+
+            if (!archives.containsKey(colId)) {
                 archives.put(colId, new ReferenceArchive(dirs));
             }
         }
@@ -116,8 +114,7 @@ public Collection<String> getAllFileIds(String collectionID) {
     }
 
     @Override
-    public FileInfo downloadFileForValidation(String fileID, String collectionID, InputStream inputStream)
-            throws IOException {
+    public FileInfo downloadFileForValidation(String fileID, String collectionID, InputStream inputStream) throws IOException {
         return new DefaultFileInfo(getArchive(collectionID).downloadFileForValidation(fileID, inputStream));
     }
 
@@ -130,42 +127,43 @@ public void moveToArchive(String fileID, String collectionID) {
     public void deleteFile(String fileID, String collectionID) {
         getArchive(collectionID).deleteFile(fileID);
     }
-    
+
     @Override
     public synchronized void replaceFile(String fileID, String collectionID) {
         getArchive(collectionID).replaceFile(fileID);
     }
-    
+
     @Override
     public long sizeLeftInArchive(String collectionID) {
         return getArchive(collectionID).sizeLeftInArchive();
     }
-    
+
     @Override
     public FileInfo getFileInTmpDir(String fileID, String collectionID) {
         return new DefaultFileInfo(getArchive(collectionID).getFileInTmpDir(fileID));
     }
-    
+
     @Override
     public void ensureFileNotInTmpDir(String fileID, String collectionID) {
         getArchive(collectionID).ensureFileNotInTmpDir(fileID);
     }
-    
+
     @Override
     public void close() {
-        for(ReferenceArchive ra : archives.values()){
+        for (ReferenceArchive ra : archives.values()) {
             ra.close();
         }
     }
-    
+
     /**
      * Validates the existence of the archive before accessing it.
-     * If it does not exist, then an IllegalStateException is thrown. 
+     * If it does not exist, then an IllegalStateException is thrown.
+     *
      * @param collectionID The id of the collection.
      * @return The archive for the collection.
      */
     private ReferenceArchive getArchive(String collectionID) {
-        if(archives.containsKey(collectionID)) {
+        if (archives.containsKey(collectionID)) {
             return archives.get(collectionID);
         } else {
             throw new IllegalStateException("The collection '" + collectionID + "' has no attached archive.");
diff --git a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/filearchive/ReferenceArchive.java b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/filearchive/ReferenceArchive.java
index 600bd0ce4..0a3b0de65 100644
--- a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/filearchive/ReferenceArchive.java
+++ b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/store/filearchive/ReferenceArchive.java
@@ -1,29 +1,33 @@
 /*
  * #%L
  * Bitmagasin integrationstest
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.pillar.store.filearchive;
 
+import org.bitrepository.common.ArgumentValidator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
@@ -34,44 +38,37 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.bitrepository.common.ArgumentValidator;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
  * Class for managing the files for the reference pillar. This supports a single CollectionID.
  */
 public class ReferenceArchive {
-    private Logger log = LoggerFactory.getLogger(getClass());
-    /** The maximum buffer for the stream interaction.*/
+    private final Logger log = LoggerFactory.getLogger(getClass());
+    private final Object lock = new Object();
     public static final int MAX_BUFFER_SIZE = 32 * 1024;
-
-    /** The list of directories to manage.*/
     private final List<ArchiveDirectory> directories = new ArrayList<>();
-    
-    /** 
-     * Constructor. Initializes the file directory. 
-     * 
+
+    /**
      * @param dirPaths The list of paths to the archival base directories.
      */
     public ReferenceArchive(List<String> dirPaths) {
         ArgumentValidator.checkNotNullOrEmpty(dirPaths, "List<String> dirPaths");
 
-        for(String dir : dirPaths) {
+        for (String dir : dirPaths) {
             directories.add(new ArchiveDirectory(dir));
         }
     }
 
     /**
      * Retrieves the file for the given file id.
+     *
      * @param fileID The id of the file to retrieve.
      * @return The file.
      */
     public File getFile(String fileID) {
         ArgumentValidator.checkNotNullOrEmpty(fileID, "String fileID");
-        
-        for(ArchiveDirectory dir : directories) {
-            if(dir.hasFile(fileID)) {
+
+        for (ArchiveDirectory dir : directories) {
+            if (dir.hasFile(fileID)) {
                 return dir.retrieveFile(fileID);
             }
         }
@@ -84,9 +81,9 @@ public File getFile(String fileID) {
      */
     public boolean hasFile(String fileID) {
         ArgumentValidator.checkNotNullOrEmpty(fileID, "String fileID");
-        
-        for(ArchiveDirectory dir : directories) {
-            if(dir.hasFile(fileID)) {
+
+        for (ArchiveDirectory dir : directories) {
+            if (dir.hasFile(fileID)) {
                 return true;
             }
         }
@@ -98,29 +95,30 @@ public boolean hasFile(String fileID) {
      */
     public Collection<String> getAllFileIds() {
         List<String> res = new ArrayList<>();
-        for(ArchiveDirectory dir : directories) {
+        for (ArchiveDirectory dir : directories) {
             res.addAll(dir.getFileIds());
         }
         return res;
     }
 
     /**
-     * Retrieves an inputstream to the given file.
+     * Retrieves an input-stream to the given file.
+     *
      * @param fileID The id of the file.
-     * @return The inputstream to the file.
-     * @throws IOException If no inputstream can be made.
+     * @return The input-stream to the file.
+     * @throws IOException If no input-stream can be made.
      */
-    public FileInputStream getFileAsInputstream(String fileID) throws IOException {
+    public FileInputStream getFileAsInputStream(String fileID) throws IOException {
         return new FileInputStream(getFile(fileID));
     }
 
     /**
-     * Creates a file from the data in the inputstream.
+     * Creates a file from the data in the input-stream.
      * The file will be placed in the temporary directory, and requires validation before it can be moved to the
      * file archive.
      *
      * @param fileID      The id of the file to create.
-     * @param inputStream The inputstream to extract the content of the file from.
+     * @param inputStream The input-stream to extract the content of the file from.
      * @return The file, which should be validated.
      * @throws IOException If it fails to download the file.
      */
@@ -129,147 +127,153 @@ public File downloadFileForValidation(String fileID, InputStream inputStream) th
         ArgumentValidator.checkNotNull(inputStream, "inputStream");
 
         ArchiveDirectory dir = getDirWithMostSpace();
-        File downloadedFile = null;
-        synchronized(dir) {
+        File downloadedFile;
+        synchronized (lock) {
             downloadedFile = dir.getNewFileInTempDir(fileID);
             log.debug("Downloading the file '" + fileID + "' for validation.");
-            
+
             // Save InputStream to the file.
-            try (BufferedOutputStream bufferedOutputstream 
-                    = new BufferedOutputStream(new FileOutputStream(downloadedFile))){
+            try (BufferedOutputStream bufferedOutputstream
+                         = new BufferedOutputStream(new FileOutputStream(downloadedFile))) {
                 byte[] buffer = new byte[MAX_BUFFER_SIZE];
                 int bytesRead = 0;
                 while ((bytesRead = inputStream.read(buffer)) != -1) {
                     bufferedOutputstream.write(buffer, 0, bytesRead);
                 }
-            } 
+            }
         }
         return downloadedFile;
     }
-    
+
     /**
      * Moves a file from the tmpDir to fileDir.
+     *
      * @param fileID The id of the file.
      */
     public void moveToArchive(String fileID) {
         ArgumentValidator.checkNotNullOrEmpty(fileID, "String fileID");
         log.info("Moving the file '" + fileID + "' to archive.");
 
-        ArchiveDirectory dir = getDirWithTmpFile(fileID);
-        synchronized(dir) {
+        synchronized (lock) {
+            ArchiveDirectory dir = getDirWithTmpFile(fileID);
             dir.moveFromTmpToArchive(fileID);
         }
     }
 
     /**
      * Removes a file from the archive.
+     *
      * @param fileID The id of the file.
      */
     public void deleteFile(String fileID) {
         ArgumentValidator.checkNotNullOrEmpty(fileID, "String fileID");
 
-        ArchiveDirectory dir = getDirWithFile(fileID);
-        synchronized(dir) {
+        synchronized (lock) {
+            ArchiveDirectory dir = getDirWithFile(fileID);
             dir.removeFileFromArchive(fileID);
         }
     }
-    
+
     /**
      * The replace operation atomically.
      * Removes the archived file from its directory, and moves the tmpFile into the archive dir.
-     * 
+     *
      * @param fileID The id of the file to perform the replace function upon.
      */
     public synchronized void replaceFile(String fileID) {
         ArgumentValidator.checkNotNullOrEmpty(fileID, "String fileID");
-        
-        ArchiveDirectory tmpDir = getDirWithTmpFile(fileID);
-        
-        synchronized(tmpDir) {
+
+        synchronized (lock) {
+            ArchiveDirectory tmpDir = getDirWithTmpFile(fileID);
             ArchiveDirectory fileDir = getDirWithFile(fileID);
             fileDir.removeFileFromArchive(fileID);
             tmpDir.moveFromTmpToArchive(fileID);
         }
     }
-    
+
     /**
      * For retrieval of the size left in this archive.
+     *
      * @return The number of bytes left in the archive.
      */
     public long sizeLeftInArchive() {
         return getDirWithMostSpace().getBytesLeft();
     }
-    
+
     /**
      * Retrieves the file within a tmpDir.
+     *
      * @param fileID The id of the file to locate within the tmpDir.
      * @return The file in the tmpDir.
      */
     public File getFileInTmpDir(String fileID) {
         return getDirWithTmpFile(fileID).getFileInTempDir(fileID);
     }
-    
+
     /**
      * Ensures that no such file exists within the tmp directory.
-     * 
+     *
      * @param fileID The id of the file to clean up after.
      */
     public void ensureFileNotInTmpDir(String fileID) {
-        for(ArchiveDirectory dir : directories) {
-            if(dir.hasFileInTempDir(fileID)) {
+        for (ArchiveDirectory dir : directories) {
+            if (dir.hasFileInTempDir(fileID)) {
                 log.info("Removing tmp file '" + fileID + "' from tmp dir '" + dir + "'.");
                 dir.removeFileFromTmp(fileID);
             }
         }
     }
-    
+
     /**
      * Finds the directory with the most space left.
+     *
      * @return The archive directory with the most space left.
      */
     private ArchiveDirectory getDirWithMostSpace() {
         Long largestSize = -1L;
         ArchiveDirectory res = null;
-        
-        for(ArchiveDirectory dir : directories) {
-            if(largestSize < dir.getBytesLeft()) {
+
+        for (ArchiveDirectory dir : directories) {
+            if (largestSize < dir.getBytesLeft()) {
                 largestSize = dir.getBytesLeft();
                 res = dir;
             }
         }
         return res;
     }
-    
+
     /**
      * Finds the archive directory with the given file within its archive directory.
+     *
      * @param fileID The id of the file.
      * @return The archive directory with the file.
      */
     private ArchiveDirectory getDirWithFile(String fileID) {
-        for(ArchiveDirectory dir : directories) {
-            if(dir.hasFile(fileID)) {
+        for (ArchiveDirectory dir : directories) {
+            if (dir.hasFile(fileID)) {
                 return dir;
             }
         }
-        
+
         throw new IllegalStateException("Does not have the file '" + fileID + "' within any archive dirs.");
     }
 
     /**
      * Finds the archive directory with the given file within its tmp directory, ready for archival.
+     *
      * @param fileID The id of the file.
      * @return The archive directory with the file in its tmp dir.
      */
     private ArchiveDirectory getDirWithTmpFile(String fileID) {
-        for(ArchiveDirectory dir : directories) {
-            if(dir.hasFileInTempDir(fileID)) {
+        for (ArchiveDirectory dir : directories) {
+            if (dir.hasFileInTempDir(fileID)) {
                 return dir;
             }
         }
-        
+
         throw new IllegalStateException("Does not have the file '" + fileID + "' within any archive dirs.");
     }
-    
+
     /**
      * Closes the reference archive.
      */
diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/DefaultPillarTest.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/DefaultPillarTest.java
index a39f1fc1c..e7ab8ea31 100644
--- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/DefaultPillarTest.java
+++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/DefaultPillarTest.java
@@ -21,10 +21,6 @@
  */
 package org.bitrepository.pillar;
 
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.IOException;
-import java.util.Date;
 import org.bitrepository.bitrepositoryelements.ChecksumDataForFileTYPE;
 import org.bitrepository.bitrepositoryelements.ChecksumSpecTYPE;
 import org.bitrepository.bitrepositoryelements.ChecksumType;
@@ -46,6 +42,11 @@
 import org.bitrepository.service.AlarmDispatcher;
 import org.bitrepository.service.audit.MockAuditManager;
 import org.bitrepository.service.contributor.ResponseDispatcher;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.util.Date;
 public abstract class DefaultPillarTest extends DefaultFixturePillarTest {
     protected FileStore archives;
     protected StorageModel model;
diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/MediatorTest.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/MediatorTest.java
index b9929b5a8..d30d78929 100644
--- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/MediatorTest.java
+++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/MediatorTest.java
@@ -21,10 +21,6 @@
  */
 package org.bitrepository.pillar;
 
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
 import org.bitrepository.bitrepositoryelements.ResponseCode;
 import org.bitrepository.bitrepositorymessages.AlarmMessage;
 import org.bitrepository.bitrepositorymessages.IdentifyContributorsForGetStatusRequest;
@@ -44,6 +40,11 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
 public class MediatorTest extends DefaultFixturePillarTest {
     MockAuditManager audits;
     MessageHandlerContext context;
diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/MockedPillarTest.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/MockedPillarTest.java
index b8f2ebe1e..a84686204 100644
--- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/MockedPillarTest.java
+++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/MockedPillarTest.java
@@ -21,8 +21,6 @@
  */
 package org.bitrepository.pillar;
 
-import static org.mockito.Mockito.mock;
-
 import org.bitrepository.bitrepositoryelements.ChecksumDataForFileTYPE;
 import org.bitrepository.bitrepositoryelements.ChecksumSpecTYPE;
 import org.bitrepository.bitrepositoryelements.ChecksumType;
@@ -36,7 +34,8 @@
 import org.bitrepository.protocol.FileExchange;
 import org.bitrepository.service.audit.MockAuditManager;
 import org.bitrepository.service.contributor.ResponseDispatcher;
-import org.mockito.Mock;
+
+import static org.mockito.Mockito.mock;
 
 public abstract class MockedPillarTest extends DefaultFixturePillarTest {
     protected PillarMediator mediator;
diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/common/FileInfoStub.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/common/FileInfoStub.java
index 68f3a25ed..383900cd2 100644
--- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/common/FileInfoStub.java
+++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/common/FileInfoStub.java
@@ -21,11 +21,11 @@
  */
 package org.bitrepository.pillar.common;
 
+import org.bitrepository.common.filestore.FileInfo;
+
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.bitrepository.common.filestore.FileInfo;
-
 
 public class FileInfoStub implements FileInfo {
 
@@ -47,7 +47,7 @@ public String getFileID() {
     }
 
     @Override
-    public InputStream getInputstream() throws IOException {
+    public InputStream getInputStream() throws IOException {
         return is;
     }
 
diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/common/SettingsHelperTest.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/common/SettingsHelperTest.java
index 9545f22c8..c64ba2f3f 100644
--- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/common/SettingsHelperTest.java
+++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/common/SettingsHelperTest.java
@@ -22,15 +22,15 @@
 
 package org.bitrepository.pillar.common;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
 import org.bitrepository.pillar.integration.func.Assert;
 import org.bitrepository.settings.repositorysettings.Collection;
 import org.bitrepository.settings.repositorysettings.PillarIDs;
 import org.testng.annotations.Test;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
 public class SettingsHelperTest {
     @Test( groups = {"regressiontest"})
     public void getPillarCollectionsTest() {
diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/CollectionTestHelper.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/CollectionTestHelper.java
index 914376e39..c4676e322 100644
--- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/CollectionTestHelper.java
+++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/CollectionTestHelper.java
@@ -21,8 +21,6 @@
  * #L%
  */
 
-import java.util.Collection;
-
 import org.bitrepository.access.AccessComponentFactory;
 import org.bitrepository.access.getfileids.GetFileIDsClient;
 import org.bitrepository.common.settings.Settings;
@@ -30,10 +28,11 @@
 import org.bitrepository.modify.deletefile.DeleteFileClient;
 import org.bitrepository.modify.putfile.PutFileClient;
 import org.bitrepository.protocol.fileexchange.HttpServerConfiguration;
-import org.bitrepository.protocol.fileexchange.HttpServerConnector;
 import org.bitrepository.protocol.security.DummySecurityManager;
 import org.bitrepository.protocol.security.SecurityManager;
 
+import java.util.Collection;
+
 @SuppressWarnings("unused")
 public class CollectionTestHelper {
     private final Settings settings;
diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/EmbeddedPillar.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/EmbeddedPillar.java
index 1b5ade804..0abeef08b 100644
--- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/EmbeddedPillar.java
+++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/EmbeddedPillar.java
@@ -22,22 +22,18 @@
  */
 
 
-import java.io.File;
-import java.util.Arrays;
-
 import org.bitrepository.common.settings.Settings;
 import org.bitrepository.common.utils.FileUtils;
 import org.bitrepository.pillar.Pillar;
 import org.bitrepository.pillar.PillarComponentFactory;
-import org.bitrepository.protocol.activemq.ActiveMQMessageBus;
 import org.bitrepository.protocol.messagebus.MessageBus;
 import org.bitrepository.protocol.messagebus.MessageBusManager;
-import org.bitrepository.protocol.messagebus.SimpleMessageBus;
-import org.bitrepository.protocol.security.DummySecurityManager;
 import org.bitrepository.service.LifeCycledService;
 import org.bitrepository.settings.referencesettings.CollectionDirs;
 import org.bitrepository.settings.referencesettings.PillarType;
 
+import java.io.File;
+
 public class EmbeddedPillar implements LifeCycledService {
     private final Pillar pillar;
 
diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/PillarIntegrationTest.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/PillarIntegrationTest.java
index b0b31fadc..352e4f9ff 100644
--- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/PillarIntegrationTest.java
+++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/PillarIntegrationTest.java
@@ -55,12 +55,11 @@
 import org.testng.annotations.AfterSuite;
 import org.testng.annotations.BeforeClass;
 
+import javax.jms.JMSException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Arrays;
 
-import javax.jms.JMSException;
-
 /**
  * Super class for all tests which should test functionality on a single pillar.
  *
diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/PillarFunctionTest.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/PillarFunctionTest.java
index 6afa81ea2..31e3c5a6a 100644
--- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/PillarFunctionTest.java
+++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/PillarFunctionTest.java
@@ -21,15 +21,15 @@
  */
 package org.bitrepository.pillar.integration.func;
 
-import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.Collection;
-
 import org.bitrepository.pillar.integration.PillarIntegrationTest;
 import org.bitrepository.pillar.messagefactories.PutFileMessageFactory;
 import org.bitrepository.protocol.bus.MessageReceiver;
 import org.testng.annotations.BeforeMethod;
 
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.Collection;
+
 /**
  * The parent class for pillar acceptance tests. The tests can be run in a multi pillar collection has the tests will
  * ignore responses from other pillars.
diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/deletefile/DeleteFileRequestIT.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/deletefile/DeleteFileRequestIT.java
index 15debce47..7ed6b42b1 100644
--- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/deletefile/DeleteFileRequestIT.java
+++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/deletefile/DeleteFileRequestIT.java
@@ -21,19 +21,16 @@
  */
 package org.bitrepository.pillar.integration.func.deletefile;
 
-import java.lang.reflect.Method;
-import java.util.concurrent.TimeUnit;
-
 import org.bitrepository.bitrepositoryelements.ChecksumSpecTYPE;
 import org.bitrepository.bitrepositoryelements.ChecksumType;
 import org.bitrepository.bitrepositoryelements.ResponseCode;
+import org.bitrepository.bitrepositorymessages.DeleteFileFinalResponse;
+import org.bitrepository.bitrepositorymessages.DeleteFileProgressResponse;
+import org.bitrepository.bitrepositorymessages.DeleteFileRequest;
 import org.bitrepository.bitrepositorymessages.IdentifyPillarsForDeleteFileRequest;
 import org.bitrepository.bitrepositorymessages.IdentifyPillarsForDeleteFileResponse;
 import org.bitrepository.bitrepositorymessages.MessageRequest;
 import org.bitrepository.bitrepositorymessages.MessageResponse;
-import org.bitrepository.bitrepositorymessages.DeleteFileFinalResponse;
-import org.bitrepository.bitrepositorymessages.DeleteFileProgressResponse;
-import org.bitrepository.bitrepositorymessages.DeleteFileRequest;
 import org.bitrepository.common.utils.Base16Utils;
 import org.bitrepository.common.utils.TestFileHelper;
 import org.bitrepository.pillar.PillarTestGroups;
@@ -43,6 +40,9 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import java.lang.reflect.Method;
+import java.util.concurrent.TimeUnit;
+
 public class DeleteFileRequestIT extends DefaultPillarOperationTest {
     protected DeleteFileMessageFactory msgFactory;
     private String pillarDestination;
diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getaudittrails/GetAuditTrailsTest.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getaudittrails/GetAuditTrailsTest.java
index c380674d2..50224a84f 100644
--- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getaudittrails/GetAuditTrailsTest.java
+++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getaudittrails/GetAuditTrailsTest.java
@@ -21,11 +21,6 @@
  */
 package org.bitrepository.pillar.integration.func.getaudittrails;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-
-import java.util.List;
-
 import org.bitrepository.access.getaudittrails.AuditTrailQuery;
 import org.bitrepository.access.getaudittrails.client.AuditTrailResult;
 import org.bitrepository.bitrepositoryelements.AuditTrailEvent;
@@ -34,6 +29,11 @@
 import org.bitrepository.pillar.integration.func.PillarFunctionTest;
 import org.testng.annotations.Test;
 
+import java.util.List;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+
 public class GetAuditTrailsTest extends PillarFunctionTest {
     @Override
     protected void initializeCUT() {
diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getchecksums/GetChecksumQueryTest.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getchecksums/GetChecksumQueryTest.java
index bebd943a3..507fd185f 100644
--- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getchecksums/GetChecksumQueryTest.java
+++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getchecksums/GetChecksumQueryTest.java
@@ -21,11 +21,6 @@
  */
 package org.bitrepository.pillar.integration.func.getchecksums;
 
-import java.util.GregorianCalendar;
-import java.util.List;
-
-import javax.xml.datatype.XMLGregorianCalendar;
-
 import org.bitrepository.access.ContributorQuery;
 import org.bitrepository.bitrepositoryelements.ChecksumDataForChecksumSpecTYPE;
 import org.bitrepository.common.utils.CalendarUtils;
@@ -34,6 +29,10 @@
 import org.bitrepository.pillar.integration.func.PillarFunctionTest;
 import org.testng.annotations.Test;
 
+import javax.xml.datatype.XMLGregorianCalendar;
+import java.util.GregorianCalendar;
+import java.util.List;
+
 public class GetChecksumQueryTest extends PillarFunctionTest {
     
     @Test ( groups = {PillarTestGroups.FULL_PILLAR_TEST, PillarTestGroups.CHECKSUM_PILLAR_TEST} )
diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getchecksums/GetChecksumTest.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getchecksums/GetChecksumTest.java
index f04e4fa40..4ce8bf901 100644
--- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getchecksums/GetChecksumTest.java
+++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getchecksums/GetChecksumTest.java
@@ -21,11 +21,6 @@
  */
 package org.bitrepository.pillar.integration.func.getchecksums;
 
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.assertNotNull;
-
-import java.util.List;
-
 import org.bitrepository.bitrepositoryelements.ChecksumDataForChecksumSpecTYPE;
 import org.bitrepository.bitrepositoryelements.ChecksumSpecTYPE;
 import org.bitrepository.bitrepositoryelements.ChecksumType;
@@ -36,6 +31,11 @@
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
+import java.util.List;
+
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
+
 public class GetChecksumTest extends PillarFunctionTest {
 
     @BeforeClass
diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getchecksums/IdentifyPillarsForGetChecksumsIT.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getchecksums/IdentifyPillarsForGetChecksumsIT.java
index 620bd74f5..51fd55102 100644
--- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getchecksums/IdentifyPillarsForGetChecksumsIT.java
+++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getchecksums/IdentifyPillarsForGetChecksumsIT.java
@@ -21,9 +21,6 @@
  */
 package org.bitrepository.pillar.integration.func.getchecksums;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-
 import org.bitrepository.bitrepositoryelements.ChecksumSpecTYPE;
 import org.bitrepository.bitrepositoryelements.FileIDs;
 import org.bitrepository.bitrepositoryelements.ResponseCode;
@@ -39,6 +36,9 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+
 public class IdentifyPillarsForGetChecksumsIT extends DefaultPillarIdentificationTest {
     protected GetChecksumsMessageFactory msgFactory;
 
diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getfile/IdentifyPillarsForGetFileIT.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getfile/IdentifyPillarsForGetFileIT.java
index c43c222c1..49d453d36 100644
--- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getfile/IdentifyPillarsForGetFileIT.java
+++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getfile/IdentifyPillarsForGetFileIT.java
@@ -21,8 +21,6 @@
  */
 package org.bitrepository.pillar.integration.func.getfile;
 
-import static org.testng.Assert.assertEquals;
-
 import org.bitrepository.bitrepositoryelements.ResponseCode;
 import org.bitrepository.bitrepositorymessages.IdentifyPillarsForGetFileRequest;
 import org.bitrepository.bitrepositorymessages.IdentifyPillarsForGetFileResponse;
@@ -32,6 +30,8 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import static org.testng.Assert.assertEquals;
+
 public class IdentifyPillarsForGetFileIT extends PillarFunctionTest {
     protected GetFileMessageFactory msgFactory;
 
diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getfileids/GetFileIDsQueryTest.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getfileids/GetFileIDsQueryTest.java
index bdacd6f06..fb0794b65 100644
--- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getfileids/GetFileIDsQueryTest.java
+++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getfileids/GetFileIDsQueryTest.java
@@ -21,16 +21,6 @@
  */
 package org.bitrepository.pillar.integration.func.getfileids;
 
-import static org.bitrepository.pillar.integration.func.Assert.assertEmpty;
-import static org.bitrepository.pillar.integration.func.Assert.assertEquals;
-import static org.bitrepository.pillar.integration.func.Assert.assertTrue;
-import static org.testng.Assert.assertFalse;
-
-import java.util.GregorianCalendar;
-import java.util.List;
-
-import javax.xml.datatype.XMLGregorianCalendar;
-
 import org.bitrepository.access.ContributorQuery;
 import org.bitrepository.bitrepositoryelements.FileIDsDataItem;
 import org.bitrepository.common.utils.CalendarUtils;
@@ -38,6 +28,15 @@
 import org.bitrepository.pillar.integration.func.PillarFunctionTest;
 import org.testng.annotations.Test;
 
+import javax.xml.datatype.XMLGregorianCalendar;
+import java.util.GregorianCalendar;
+import java.util.List;
+
+import static org.bitrepository.pillar.integration.func.Assert.assertEmpty;
+import static org.bitrepository.pillar.integration.func.Assert.assertEquals;
+import static org.bitrepository.pillar.integration.func.Assert.assertTrue;
+import static org.testng.Assert.assertFalse;
+
 public class GetFileIDsQueryTest extends PillarFunctionTest {
 
     @Test ( groups = {PillarTestGroups.FULL_PILLAR_TEST, PillarTestGroups.CHECKSUM_PILLAR_TEST} )
diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getfileids/GetFileIDsTest.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getfileids/GetFileIDsTest.java
index 20258232d..2114671b2 100644
--- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getfileids/GetFileIDsTest.java
+++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getfileids/GetFileIDsTest.java
@@ -21,9 +21,6 @@
  */
 package org.bitrepository.pillar.integration.func.getfileids;
 
-import java.lang.reflect.Method;
-import java.util.concurrent.TimeUnit;
-
 import org.bitrepository.bitrepositoryelements.FileIDs;
 import org.bitrepository.bitrepositoryelements.ResponseCode;
 import org.bitrepository.bitrepositorymessages.GetFileIDsFinalResponse;
@@ -39,6 +36,9 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import java.lang.reflect.Method;
+import java.util.concurrent.TimeUnit;
+
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertNotNull;
diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getfileids/IdentifyPillarsForGetFileIDsIT.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getfileids/IdentifyPillarsForGetFileIDsIT.java
index 61389ea01..8d946361e 100644
--- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getfileids/IdentifyPillarsForGetFileIDsIT.java
+++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getfileids/IdentifyPillarsForGetFileIDsIT.java
@@ -21,9 +21,6 @@
  */
 package org.bitrepository.pillar.integration.func.getfileids;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-
 import org.bitrepository.bitrepositoryelements.FileIDs;
 import org.bitrepository.bitrepositoryelements.ResponseCode;
 import org.bitrepository.bitrepositorymessages.IdentifyPillarsForGetFileIDsRequest;
@@ -37,6 +34,9 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+
 public class IdentifyPillarsForGetFileIDsIT extends DefaultPillarIdentificationTest {
     protected GetFileIDsMessageFactory msgFactory;
 
diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getstatus/GetStatusRequestIT.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getstatus/GetStatusRequestIT.java
index ccae68e91..3b786cb70 100644
--- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getstatus/GetStatusRequestIT.java
+++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getstatus/GetStatusRequestIT.java
@@ -22,8 +22,6 @@
 
 package org.bitrepository.pillar.integration.func.getstatus;
 
-import java.lang.reflect.Method;
-
 import org.bitrepository.bitrepositoryelements.ResponseCode;
 import org.bitrepository.bitrepositorymessages.AlarmMessage;
 import org.bitrepository.bitrepositorymessages.GetStatusFinalResponse;
@@ -38,6 +36,8 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import java.lang.reflect.Method;
+
 public class GetStatusRequestIT extends PillarFunctionTest {
     protected GetStatusMessageFactory msgFactory;
     private String pillarDestination;
diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getstatus/IdentifyContributorsForGetStatusIT.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getstatus/IdentifyContributorsForGetStatusIT.java
index 643cb4f6a..15ede00e3 100644
--- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getstatus/IdentifyContributorsForGetStatusIT.java
+++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getstatus/IdentifyContributorsForGetStatusIT.java
@@ -22,10 +22,6 @@
 
 package org.bitrepository.pillar.integration.func.getstatus;
 
-import static org.testng.Assert.assertEquals;
-
-import java.lang.reflect.Method;
-
 import org.bitrepository.bitrepositoryelements.ResponseCode;
 import org.bitrepository.bitrepositorymessages.IdentifyContributorsForGetStatusRequest;
 import org.bitrepository.bitrepositorymessages.IdentifyContributorsForGetStatusResponse;
@@ -35,6 +31,10 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import java.lang.reflect.Method;
+
+import static org.testng.Assert.assertEquals;
+
 public class IdentifyContributorsForGetStatusIT extends PillarFunctionTest {
     protected GetStatusMessageFactory msgFactory;
 
diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/multicollection/MultipleCollectionIT.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/multicollection/MultipleCollectionIT.java
index d0158835b..46c8c6f8d 100644
--- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/multicollection/MultipleCollectionIT.java
+++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/multicollection/MultipleCollectionIT.java
@@ -21,9 +21,6 @@
  */
 package org.bitrepository.pillar.integration.func.multicollection;
 
-import java.util.Arrays;
-import java.util.Collection;
-
 import org.bitrepository.access.ContributorQuery;
 import org.bitrepository.client.exceptions.NegativeResponseException;
 import org.bitrepository.common.utils.TestFileHelper;
@@ -33,6 +30,9 @@
 import org.bitrepository.protocol.bus.MessageReceiver;
 import org.testng.annotations.Test;
 
+import java.util.Arrays;
+import java.util.Collection;
+
 public class MultipleCollectionIT extends PillarIntegrationTest {
     /** Used for receiving responses from the pillar */
     protected MessageReceiver clientReceiver;
diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/putfile/PutFileRequestIT.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/putfile/PutFileRequestIT.java
index 2c33ddfac..eff5fbac7 100644
--- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/putfile/PutFileRequestIT.java
+++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/putfile/PutFileRequestIT.java
@@ -21,13 +21,6 @@
  */
 package org.bitrepository.pillar.integration.func.putfile;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertNull;
-
-import java.lang.reflect.Method;
-import java.util.concurrent.TimeUnit;
-
 import org.bitrepository.bitrepositoryelements.ResponseCode;
 import org.bitrepository.bitrepositorymessages.IdentifyPillarsForPutFileRequest;
 import org.bitrepository.bitrepositorymessages.IdentifyPillarsForPutFileResponse;
@@ -44,6 +37,13 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import java.lang.reflect.Method;
+import java.util.concurrent.TimeUnit;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertNull;
+
 public class PutFileRequestIT extends DefaultPillarOperationTest {
     protected PutFileMessageFactory msgFactory;
     private String pillarDestination;
diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/replacefile/ReplaceFileRequestIT.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/replacefile/ReplaceFileRequestIT.java
index 8ad1cf9d8..b11857b8c 100644
--- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/replacefile/ReplaceFileRequestIT.java
+++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/replacefile/ReplaceFileRequestIT.java
@@ -21,9 +21,6 @@
  */
 package org.bitrepository.pillar.integration.func.replacefile;
 
-import java.lang.reflect.Method;
-import java.util.concurrent.TimeUnit;
-
 import org.bitrepository.bitrepositoryelements.ResponseCode;
 import org.bitrepository.bitrepositorymessages.IdentifyPillarsForReplaceFileRequest;
 import org.bitrepository.bitrepositorymessages.IdentifyPillarsForReplaceFileResponse;
@@ -40,6 +37,9 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import java.lang.reflect.Method;
+import java.util.concurrent.TimeUnit;
+
 public class ReplaceFileRequestIT extends DefaultPillarOperationTest {
     protected ReplaceFileMessageFactory msgFactory;
     private String pillarDestination;
diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/model/PillarFileManager.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/model/PillarFileManager.java
index d758b3690..f56880923 100644
--- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/model/PillarFileManager.java
+++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/model/PillarFileManager.java
@@ -22,8 +22,6 @@
 
 package org.bitrepository.pillar.integration.model;
 
-import java.util.List;
-
 import org.bitrepository.access.ContributorQuery;
 import org.bitrepository.access.getchecksums.conversation.ChecksumsCompletePillarEvent;
 import org.bitrepository.access.getfileids.conversation.FileIDsCompletePillarEvent;
@@ -38,9 +36,10 @@
 import org.bitrepository.common.utils.TestFileHelper;
 import org.bitrepository.pillar.integration.ClientProvider;
 import org.bitrepository.protocol.fileexchange.HttpServerConfiguration;
-import org.bitrepository.protocol.fileexchange.HttpServerConnector;
 import org.jaccept.TestEventManager;
 
+import java.util.List;
+
 public class PillarFileManager {
     private final String collectionID;
     private final String pillarID;
diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/perf/PutFileStressIT.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/perf/PutFileStressIT.java
index 1688d60cf..76b212d9f 100644
--- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/perf/PutFileStressIT.java
+++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/perf/PutFileStressIT.java
@@ -21,8 +21,6 @@
  * #L%
  */
 
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.LinkedBlockingQueue;
 import org.bitrepository.client.eventhandler.EventHandler;
 import org.bitrepository.client.eventhandler.OperationEvent;
 import org.bitrepository.common.utils.TestFileHelper;
@@ -33,6 +31,9 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
+
 public class PutFileStressIT extends PillarPerformanceTest {
     protected PutFileClient putClient;
 
diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/messagefactories/GetChecksumsMessageFactory.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/messagefactories/GetChecksumsMessageFactory.java
index 148cb715f..edf7a5b60 100644
--- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/messagefactories/GetChecksumsMessageFactory.java
+++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/messagefactories/GetChecksumsMessageFactory.java
@@ -24,16 +24,15 @@
  */
 package org.bitrepository.pillar.messagefactories;
 
-import java.math.BigInteger;
-
-import javax.xml.datatype.XMLGregorianCalendar;
-
 import org.bitrepository.bitrepositoryelements.ChecksumSpecTYPE;
 import org.bitrepository.bitrepositoryelements.FileIDs;
 import org.bitrepository.bitrepositorymessages.GetChecksumsRequest;
 import org.bitrepository.bitrepositorymessages.IdentifyPillarsForGetChecksumsRequest;
 import org.bitrepository.common.settings.Settings;
 
+import javax.xml.datatype.XMLGregorianCalendar;
+import java.math.BigInteger;
+
 public class GetChecksumsMessageFactory extends PillarTestMessageFactory {
     public GetChecksumsMessageFactory(String collectionID, Settings clientSettings, String pillarID,
                                       String pillarDestination) {
diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/messagefactories/GetFileIDsMessageFactory.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/messagefactories/GetFileIDsMessageFactory.java
index aef4897d4..ab574177b 100644
--- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/messagefactories/GetFileIDsMessageFactory.java
+++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/messagefactories/GetFileIDsMessageFactory.java
@@ -24,15 +24,14 @@
  */
 package org.bitrepository.pillar.messagefactories;
 
-import java.math.BigInteger;
-
-import javax.xml.datatype.XMLGregorianCalendar;
-
 import org.bitrepository.bitrepositoryelements.FileIDs;
 import org.bitrepository.bitrepositorymessages.GetFileIDsRequest;
 import org.bitrepository.bitrepositorymessages.IdentifyPillarsForGetFileIDsRequest;
 import org.bitrepository.common.settings.Settings;
 
+import javax.xml.datatype.XMLGregorianCalendar;
+import java.math.BigInteger;
+
 public class GetFileIDsMessageFactory extends PillarTestMessageFactory {
     public GetFileIDsMessageFactory(String collectionID, Settings clientSettings, String pillarID, 
             String pillarDestination) {
diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/messagefactories/PillarTestMessageFactory.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/messagefactories/PillarTestMessageFactory.java
index 87229ac5e..536055ad5 100644
--- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/messagefactories/PillarTestMessageFactory.java
+++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/messagefactories/PillarTestMessageFactory.java
@@ -21,12 +21,12 @@
  */
 package org.bitrepository.pillar.messagefactories;
 
-import java.util.UUID;
-
 import org.bitrepository.bitrepositorymessages.MessageRequest;
 import org.bitrepository.common.settings.Settings;
 import org.bitrepository.protocol.message.ComponentTestMessageFactory;
 
+import java.util.UUID;
+
 public abstract class PillarTestMessageFactory {
     private final ComponentTestMessageFactory componentTestMessageFactory;
     private final String pillarDestinationID;
diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/messagefactories/PutFileMessageFactory.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/messagefactories/PutFileMessageFactory.java
index 9094ec72c..05c16cf29 100644
--- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/messagefactories/PutFileMessageFactory.java
+++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/messagefactories/PutFileMessageFactory.java
@@ -39,14 +39,14 @@
  */
 package org.bitrepository.pillar.messagefactories;
 
-import java.math.BigInteger;
-
 import org.bitrepository.bitrepositoryelements.ChecksumDataForFileTYPE;
 import org.bitrepository.bitrepositoryelements.ChecksumSpecTYPE;
 import org.bitrepository.bitrepositorymessages.IdentifyPillarsForPutFileRequest;
 import org.bitrepository.bitrepositorymessages.PutFileRequest;
 import org.bitrepository.common.settings.Settings;
 
+import java.math.BigInteger;
+
 public class PutFileMessageFactory extends PillarTestMessageFactory {
     
     public PutFileMessageFactory(
diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/messagefactories/ReplaceFileMessageFactory.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/messagefactories/ReplaceFileMessageFactory.java
index a901a265c..4c9ac8bef 100644
--- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/messagefactories/ReplaceFileMessageFactory.java
+++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/messagefactories/ReplaceFileMessageFactory.java
@@ -39,14 +39,14 @@
  */
 package org.bitrepository.pillar.messagefactories;
 
-import java.math.BigInteger;
-
 import org.bitrepository.bitrepositoryelements.ChecksumDataForFileTYPE;
 import org.bitrepository.bitrepositoryelements.ChecksumSpecTYPE;
 import org.bitrepository.bitrepositorymessages.IdentifyPillarsForReplaceFileRequest;
 import org.bitrepository.bitrepositorymessages.ReplaceFileRequest;
 import org.bitrepository.common.settings.Settings;
 
+import java.math.BigInteger;
+
 public class ReplaceFileMessageFactory extends PillarTestMessageFactory {
     public ReplaceFileMessageFactory(String collectionID, Settings clientSettings, String pillarID,
                                      String pillarDestination) {
diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/messagehandling/DeleteFileTest.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/messagehandling/DeleteFileTest.java
index b50ea89d1..fa3e760c6 100644
--- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/messagehandling/DeleteFileTest.java
+++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/messagehandling/DeleteFileTest.java
@@ -24,12 +24,6 @@
  */
 package org.bitrepository.pillar.messagehandling;
 
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doAnswer;
-import static org.testng.Assert.assertEquals;
-
 import org.bitrepository.bitrepositoryelements.AlarmCode;
 import org.bitrepository.bitrepositoryelements.ChecksumSpecTYPE;
 import org.bitrepository.bitrepositoryelements.ResponseCode;
@@ -45,6 +39,12 @@
 import org.mockito.stubbing.Answer;
 import org.testng.annotations.Test;
 
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doAnswer;
+import static org.testng.Assert.assertEquals;
+
 /**
  * Tests the PutFile functionality on the ReferencePillar.
  */
diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/messagehandling/GetAuditTrailsTest.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/messagehandling/GetAuditTrailsTest.java
index c571dd479..10ee4ed1d 100644
--- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/messagehandling/GetAuditTrailsTest.java
+++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/messagehandling/GetAuditTrailsTest.java
@@ -21,9 +21,6 @@
  */
 package org.bitrepository.pillar.messagehandling;
 
-import java.math.BigInteger;
-import java.util.Date;
-import javax.xml.datatype.XMLGregorianCalendar;
 import org.bitrepository.bitrepositoryelements.AuditTrailEvent;
 import org.bitrepository.bitrepositoryelements.FileAction;
 import org.bitrepository.bitrepositoryelements.ResponseCode;
@@ -37,6 +34,10 @@
 import org.bitrepository.pillar.messagefactories.GetAuditTrailsMessageFactory;
 import org.testng.annotations.Test;
 
+import javax.xml.datatype.XMLGregorianCalendar;
+import java.math.BigInteger;
+import java.util.Date;
+
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/messagehandling/GetChecksumsTest.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/messagehandling/GetChecksumsTest.java
index 9acfbb9ea..3625ecb76 100644
--- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/messagehandling/GetChecksumsTest.java
+++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/messagehandling/GetChecksumsTest.java
@@ -24,20 +24,7 @@
  */
 package org.bitrepository.pillar.messagehandling;
 
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doAnswer;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNull;
-
-import java.util.Date;
-
-import javax.xml.datatype.XMLGregorianCalendar;
-
 import org.bitrepository.bitrepositoryelements.ChecksumSpecTYPE;
-import org.bitrepository.bitrepositoryelements.ChecksumType;
 import org.bitrepository.bitrepositoryelements.FileIDs;
 import org.bitrepository.bitrepositoryelements.ResponseCode;
 import org.bitrepository.bitrepositorymessages.AlarmMessage;
@@ -56,6 +43,16 @@
 import org.mockito.stubbing.Answer;
 import org.testng.annotations.Test;
 
+import javax.xml.datatype.XMLGregorianCalendar;
+import java.util.Date;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doAnswer;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNull;
+
 /**
  * Tests the PutFile functionality on the ReferencePillar.
  */
diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/messagehandling/GetFileIDsTest.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/messagehandling/GetFileIDsTest.java
index b45b568e4..2d1c5e0c9 100644
--- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/messagehandling/GetFileIDsTest.java
+++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/messagehandling/GetFileIDsTest.java
@@ -24,19 +24,6 @@
  */
 package org.bitrepository.pillar.messagehandling;
 
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.isNull;
-import static org.mockito.Mockito.doAnswer;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNull;
-
-import java.util.Date;
-
-import javax.xml.datatype.XMLGregorianCalendar;
-
 import org.bitrepository.bitrepositoryelements.FileIDs;
 import org.bitrepository.bitrepositoryelements.ResponseCode;
 import org.bitrepository.bitrepositorymessages.AlarmMessage;
@@ -54,6 +41,18 @@
 import org.mockito.stubbing.Answer;
 import org.testng.annotations.Test;
 
+import javax.xml.datatype.XMLGregorianCalendar;
+import java.util.Date;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isNull;
+import static org.mockito.Mockito.doAnswer;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNull;
+
 /**
  * Tests the PutFile functionality on the ReferencePillar.
  */
diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/messagehandling/GetFileTest.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/messagehandling/GetFileTest.java
index fc0a3fabc..7b511a005 100644
--- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/messagehandling/GetFileTest.java
+++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/messagehandling/GetFileTest.java
@@ -24,13 +24,6 @@
  */
 package org.bitrepository.pillar.messagehandling;
 
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doAnswer;
-import static org.testng.Assert.assertEquals;
-
-import java.io.ByteArrayInputStream;
-
 import org.bitrepository.bitrepositoryelements.ResponseCode;
 import org.bitrepository.bitrepositorymessages.AlarmMessage;
 import org.bitrepository.bitrepositorymessages.GetFileFinalResponse;
@@ -49,6 +42,13 @@
 import org.mockito.stubbing.Answer;
 import org.testng.annotations.Test;
 
+import java.io.ByteArrayInputStream;
+
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doAnswer;
+import static org.testng.Assert.assertEquals;
+
 /**
  * Tests the PutFile functionality on the ReferencePillar.
  */
diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/messagehandling/PutFileTest.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/messagehandling/PutFileTest.java
index 3092fc0c0..a14b096f3 100644
--- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/messagehandling/PutFileTest.java
+++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/messagehandling/PutFileTest.java
@@ -24,15 +24,6 @@
  */
 package org.bitrepository.pillar.messagehandling;
 
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.when;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertNull;
-
 import org.bitrepository.bitrepositoryelements.AlarmCode;
 import org.bitrepository.bitrepositoryelements.ChecksumDataForFileTYPE;
 import org.bitrepository.bitrepositoryelements.ChecksumSpecTYPE;
@@ -51,6 +42,15 @@
 import org.mockito.stubbing.Answer;
 import org.testng.annotations.Test;
 
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.when;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertNull;
+
 /**
  * Tests the PutFile functionality on the ReferencePillar.
  */
diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/messagehandling/ReplaceFileTest.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/messagehandling/ReplaceFileTest.java
index 0151ff5bf..53bab5e94 100644
--- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/messagehandling/ReplaceFileTest.java
+++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/messagehandling/ReplaceFileTest.java
@@ -24,14 +24,6 @@
  */
 package org.bitrepository.pillar.messagehandling;
 
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doAnswer;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNull;
-import static org.testng.Assert.assertNotNull;
-
 import org.bitrepository.bitrepositoryelements.AlarmCode;
 import org.bitrepository.bitrepositoryelements.ChecksumDataForFileTYPE;
 import org.bitrepository.bitrepositoryelements.ChecksumSpecTYPE;
@@ -50,6 +42,14 @@
 import org.mockito.stubbing.Answer;
 import org.testng.annotations.Test;
 
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doAnswer;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertNull;
+
 /**
  * Tests the ReplaceFile functionality on the ReferencePillar.
  */
diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/schedulablejobs/RecalculateChecksumWorkflowTest.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/schedulablejobs/RecalculateChecksumWorkflowTest.java
index 61f27c25c..06688702e 100644
--- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/schedulablejobs/RecalculateChecksumWorkflowTest.java
+++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/schedulablejobs/RecalculateChecksumWorkflowTest.java
@@ -22,7 +22,6 @@
  */
 
 import org.bitrepository.pillar.DefaultPillarTest;
-import org.bitrepository.pillar.schedulablejobs.RecalculateChecksumJob;
 import org.bitrepository.service.workflow.SchedulableJob;
 import org.testng.Assert;
 import org.testng.annotations.Test;
diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/store/ChecksumPillarModelTest.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/store/ChecksumPillarModelTest.java
index 4bd0580d6..cc8f7fd67 100644
--- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/store/ChecksumPillarModelTest.java
+++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/store/ChecksumPillarModelTest.java
@@ -21,15 +21,6 @@
  */
 package org.bitrepository.pillar.store;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
-
-import java.io.IOException;
-import java.util.Date;
-
 import org.bitrepository.bitrepositoryelements.ChecksumSpecTYPE;
 import org.bitrepository.bitrepositoryelements.ChecksumType;
 import org.bitrepository.common.utils.ChecksumUtils;
@@ -41,6 +32,15 @@
 import org.bitrepository.settings.referencesettings.ChecksumPillarFileDownload;
 import org.testng.annotations.Test;
 
+import java.io.IOException;
+import java.util.Date;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
+
 public class ChecksumPillarModelTest extends DefaultFixturePillarTest {
     ChecksumStorageModel pillarModel;
     ChecksumStore cache;
diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/store/FullPillarModelTest.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/store/FullPillarModelTest.java
index 246f097c0..0733bc2a1 100644
--- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/store/FullPillarModelTest.java
+++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/store/FullPillarModelTest.java
@@ -21,15 +21,6 @@
  */
 package org.bitrepository.pillar.store;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNull;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-
 import org.bitrepository.bitrepositoryelements.ChecksumSpecTYPE;
 import org.bitrepository.bitrepositoryelements.ChecksumType;
 import org.bitrepository.common.filestore.FileInfo;
@@ -44,6 +35,15 @@
 import org.bitrepository.service.exception.RequestHandlerException;
 import org.testng.annotations.Test;
 
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
+
 public class FullPillarModelTest extends DefaultFixturePillarTest {
     FileStorageModel pillarModel;
     ChecksumStore cache;
diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/store/archive/ArchiveDirectoryTest.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/store/archive/ArchiveDirectoryTest.java
index ab843d8af..97d62b8ea 100644
--- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/store/archive/ArchiveDirectoryTest.java
+++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/store/archive/ArchiveDirectoryTest.java
@@ -21,15 +21,6 @@
  * #L%
  */
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.FileWriter;
-import java.io.OutputStreamWriter;
-import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
 import org.bitrepository.common.utils.FileUtils;
 import org.bitrepository.common.utils.TestFileHelper;
 import org.bitrepository.pillar.store.filearchive.ArchiveDirectory;
@@ -38,6 +29,14 @@
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.Test;
 
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.OutputStreamWriter;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
 public class ArchiveDirectoryTest extends ExtendedTestCase {
     private static String DIR_NAME = "archive-directory";
     private static String FILE_DIR_NAME = DIR_NAME + "/fileDir";
diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/store/archive/ReferenceArchiveTest.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/store/archive/ReferenceArchiveTest.java
index a0c64c242..892446721 100644
--- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/store/archive/ReferenceArchiveTest.java
+++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/store/archive/ReferenceArchiveTest.java
@@ -1,36 +1,30 @@
 /*
  * #%L
  * Bitrepository Reference Pillar
- * 
+ *
  * $Id: PutFileOnReferencePillarTest.java 589 2011-12-01 15:34:42Z jolf $
- * $HeadURL: https://sbforge.org/svn/bitrepository/bitrepository-reference/trunk/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/PutFileOnReferencePillarTest.java $
+ * $HeadURL: https://sbforge.org/svn/bitrepository/bitrepository-reference/trunk/bitrepository-reference-pillar/src/test/java/org
+ * /bitrepository/pillar/PutFileOnReferencePillarTest.java $
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.pillar.store.archive;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.FileWriter;
-import java.io.OutputStreamWriter;
-import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
-
 import org.bitrepository.common.utils.FileUtils;
 import org.bitrepository.pillar.DefaultPillarTest;
 import org.bitrepository.pillar.common.MessageHandlerContext;
@@ -40,15 +34,22 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.OutputStreamWriter;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+
 public class ReferenceArchiveTest extends DefaultPillarTest {
     protected ReferenceArchive archive;
     protected PillarMediator mediator;
     protected MockAuditManager audits;
     protected MessageHandlerContext context;
-    
+
     private static String DIR_NAME = "archive-directory";
     private static String FILE_DIR_NAME = DIR_NAME + "/fileDir";
-    
+
     private static String EXISTING_FILE = "file1";
     private static String MISSING_FILE = "Missing-filE";
 
@@ -60,19 +61,19 @@ protected void shutdownCUT() {
         }
         super.shutdownCUT();
     }
-    
-    @Test( groups = {"regressiontest", "pillartest"})
+
+    @Test(groups = {"regressiontest", "pillartest"})
     public void testReferenceArchive() throws Exception {
         addDescription("Test the ReferenceArchive.");
         addStep("Setup", "Should be OK.");
-        
-        ReferenceArchive archive = new ReferenceArchive(Arrays.asList(DIR_NAME));
+
+        ReferenceArchive archive = new ReferenceArchive(List.of(DIR_NAME));
         createExistingFile();
-        
+
         addStep("test 'hasFile'", "Should be true for the existing one and false for the missing one.");
         Assert.assertTrue(archive.hasFile(EXISTING_FILE));
         Assert.assertFalse(archive.hasFile(MISSING_FILE));
-        
+
         addStep("Test 'getFile'", "Should be ok for the existing file and throw an exception on the missing");
         archive.getFile(EXISTING_FILE);
         try {
@@ -81,26 +82,27 @@ public void testReferenceArchive() throws Exception {
         } catch (Exception e) {
             // expected
         }
-        
+
         addStep("Test getAllFileIDs", "Should only deliver the existing file");
-        Assert.assertEquals(archive.getAllFileIds(), Arrays.asList(EXISTING_FILE));
-        
-        addStep("Test 'getFileAsInputstream'", "Should only be able to deliver the existing file.");
-        archive.getFileAsInputstream(EXISTING_FILE);
+        Assert.assertEquals(archive.getAllFileIds(), List.of(EXISTING_FILE));
+
+        addStep("Test 'getFileAsInputStream'", "Should only be able to deliver the existing file.");
+        FileInputStream fileAsInputStream = archive.getFileAsInputStream(EXISTING_FILE);
+        assert fileAsInputStream != null;
         try {
-            archive.getFileAsInputstream(MISSING_FILE);
+            archive.getFileAsInputStream(MISSING_FILE);
             Assert.fail("Should throw an exception when getting a missing file.");
         } catch (Exception e) {
             // expected
         }
-        
+
         addStep("Delete, recreate and delete again", "Should be moved to retain dir twice.");
         archive.deleteFile(EXISTING_FILE);
         createExistingFile();
         archive.deleteFile(EXISTING_FILE);
         createExistingFile();
         Assert.assertTrue(new File(DIR_NAME + "/retainDir/" + EXISTING_FILE + ".old").isFile());
-        
+
         addStep("Try to delete missing file.", "Should throw an exception");
         try {
             archive.deleteFile(MISSING_FILE);
@@ -108,7 +110,7 @@ public void testReferenceArchive() throws Exception {
         } catch (IllegalStateException e) {
             // Expected.
         }
-        
+
         addStep("Replace a file, which does not exist in the filedir.", "Should throw an exception");
         try {
             archive.replaceFile(MISSING_FILE);
@@ -116,14 +118,15 @@ public void testReferenceArchive() throws Exception {
         } catch (IllegalStateException e) {
             // Expected.
         }
-        
-        addStep("Copy a file into the tmpDir and then use replace.", "Should create another file in retain dir and remove the one in tmpDir.");
-        FileUtils.copyFile(new File(DIR_NAME + "/retainDir/" + EXISTING_FILE), 
+
+        addStep("Copy a file into the tmpDir and then use replace.",
+                "Should create another file in retain dir and remove the one in tmpDir.");
+        FileUtils.copyFile(new File(DIR_NAME + "/retainDir/" + EXISTING_FILE),
                 new File(DIR_NAME + "/tmpDir/" + EXISTING_FILE));
         archive.replaceFile(EXISTING_FILE);
         Assert.assertFalse(new File(DIR_NAME + "/tmpDir/" + EXISTING_FILE).isFile());
         Assert.assertTrue(new File(DIR_NAME + "/retainDir/" + EXISTING_FILE + ".old.old").isFile());
-        
+
         addStep("Try performing the replace, when the file in the tempdir has been removed.", "Should throw an exception");
         try {
             archive.replaceFile(EXISTING_FILE);
@@ -131,12 +134,13 @@ public void testReferenceArchive() throws Exception {
         } catch (IllegalStateException e) {
             // Expected.
         }
-        
+
         archive.close();
     }
-    
+
     private void createExistingFile() throws Exception {
-        OutputStreamWriter osw = new OutputStreamWriter(new FileOutputStream(new File(FILE_DIR_NAME, EXISTING_FILE), false), StandardCharsets.UTF_8);
+        OutputStreamWriter osw = new OutputStreamWriter(new FileOutputStream(new File(FILE_DIR_NAME, EXISTING_FILE), false),
+                StandardCharsets.UTF_8);
         osw.write("test-data\n");
         osw.flush();
         osw.close();
diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/store/checksumcache/ChecksumDatabaseMigrationTest.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/store/checksumcache/ChecksumDatabaseMigrationTest.java
index 6db87e046..04ec51809 100644
--- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/store/checksumcache/ChecksumDatabaseMigrationTest.java
+++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/store/checksumcache/ChecksumDatabaseMigrationTest.java
@@ -21,16 +21,8 @@
  */
 package org.bitrepository.pillar.store.checksumcache;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Locale;
-import java.util.TimeZone;
-
 import org.bitrepository.common.settings.Settings;
 import org.bitrepository.common.settings.TestSettingsProvider;
-import org.bitrepository.common.utils.CalendarUtils;
 import org.bitrepository.common.utils.FileUtils;
 import org.bitrepository.pillar.store.checksumdatabase.ChecksumDBMigrator;
 import org.bitrepository.service.database.DBConnector;
@@ -43,6 +35,12 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import java.io.File;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Locale;
+import java.util.TimeZone;
+
 import static org.bitrepository.pillar.store.checksumdatabase.DatabaseConstants.CHECKSUM_TABLE;
 import static org.bitrepository.pillar.store.checksumdatabase.DatabaseConstants.CS_CHECKSUM;
 import static org.bitrepository.pillar.store.checksumdatabase.DatabaseConstants.CS_COLLECTION_ID;
diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/store/checksumcache/ChecksumDatabaseTest.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/store/checksumcache/ChecksumDatabaseTest.java
index 76a85febe..48934e014 100644
--- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/store/checksumcache/ChecksumDatabaseTest.java
+++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/store/checksumcache/ChecksumDatabaseTest.java
@@ -21,9 +21,6 @@
  */
 package org.bitrepository.pillar.store.checksumcache;
 
-import java.util.Date;
-import java.util.List;
-
 import org.bitrepository.bitrepositoryelements.ChecksumDataForChecksumSpecTYPE;
 import org.bitrepository.common.settings.Settings;
 import org.bitrepository.common.settings.TestSettingsProvider;
@@ -43,6 +40,9 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import java.util.Date;
+import java.util.List;
+
 public class ChecksumDatabaseTest extends ExtendedTestCase {
     private String collectionID;
     protected Settings settings;
diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/store/checksumcache/ChecksumEntryTest.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/store/checksumcache/ChecksumEntryTest.java
index 88e53471d..f52b9379a 100644
--- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/store/checksumcache/ChecksumEntryTest.java
+++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/store/checksumcache/ChecksumEntryTest.java
@@ -21,13 +21,13 @@
  * #L%
  */
 
-import java.util.Date;
-
 import org.bitrepository.pillar.store.checksumdatabase.ChecksumEntry;
 import org.jaccept.structure.ExtendedTestCase;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
+import java.util.Date;
+
 public class ChecksumEntryTest extends ExtendedTestCase {
     private static final String CE_FILE = "file";
     private static final String CE_CHECKSUM = "checksum";
diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/store/checksumcache/MemoryCacheMock.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/store/checksumcache/MemoryCacheMock.java
index 7dfa83e55..3025fe18c 100644
--- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/store/checksumcache/MemoryCacheMock.java
+++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/store/checksumcache/MemoryCacheMock.java
@@ -21,6 +21,12 @@
  */
 package org.bitrepository.pillar.store.checksumcache;
 
+import org.bitrepository.pillar.store.checksumdatabase.ChecksumEntry;
+import org.bitrepository.pillar.store.checksumdatabase.ChecksumStore;
+import org.bitrepository.pillar.store.checksumdatabase.ExtractedChecksumResultSet;
+import org.bitrepository.pillar.store.checksumdatabase.ExtractedFileIDsResultSet;
+
+import javax.xml.datatype.XMLGregorianCalendar;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
@@ -28,13 +34,6 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.xml.datatype.XMLGregorianCalendar;
-
-import org.bitrepository.pillar.store.checksumdatabase.ChecksumEntry;
-import org.bitrepository.pillar.store.checksumdatabase.ChecksumStore;
-import org.bitrepository.pillar.store.checksumdatabase.ExtractedChecksumResultSet;
-import org.bitrepository.pillar.store.checksumdatabase.ExtractedFileIDsResultSet;
-
 /**
  * Very simple memory based implementation of the ChecksumCache.
  * Everything is kept within a map between the file ids and their checksum.
diff --git a/bitrepository-reference-settings/src/main/resources/xsd/ReferenceSettings.xsd b/bitrepository-reference-settings/src/main/resources/xsd/ReferenceSettings.xsd
index 5ce9b7da0..6aab9a6db 100644
--- a/bitrepository-reference-settings/src/main/resources/xsd/ReferenceSettings.xsd
+++ b/bitrepository-reference-settings/src/main/resources/xsd/ReferenceSettings.xsd
@@ -23,7 +23,7 @@
 <xs:schema targetNamespace="http://bitrepository.org/settings/ReferenceSettings.xsd"
            attributeFormDefault="unqualified" elementFormDefault="qualified"
            xmlns="http://bitrepository.org/settings/ReferenceSettings.xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+>
 
   <xs:element name="ReferenceSettings">
     <xs:annotation>
diff --git a/bitrepository-service/src/main/java/org/bitrepository/service/AbstractBitrepositoryContextListener.java b/bitrepository-service/src/main/java/org/bitrepository/service/AbstractBitrepositoryContextListener.java
index 178c209b1..1235774f1 100644
--- a/bitrepository-service/src/main/java/org/bitrepository/service/AbstractBitrepositoryContextListener.java
+++ b/bitrepository-service/src/main/java/org/bitrepository/service/AbstractBitrepositoryContextListener.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -30,48 +30,51 @@
 
 /**
  * The Listener has two intentions
- * 1) Acquire necessary information at startup to locate configuration files and create the first instance 
- *      of the basic client, so everything is setup before the first users start using the webservice. 
- * 2) In time shut the service down in a proper manner, so no threads will be orphaned.   
+ * 1) Acquire necessary information at startup to locate configuration files and create the first instance
+ * of the basic client, so everything is set up before the first users start using the webservice.
+ * 2) In time shut the service down in a proper manner, so no threads will be orphaned.
  */
 public abstract class AbstractBitrepositoryContextListener implements ServletContextListener {
-    /** The log.*/
     private final Logger log = LoggerFactory.getLogger(getClass());
-        
+
     /**
      * Return the path to the service's configuration directory.
+     *
      * @return the path to the service's configuration directory
      */
     public abstract String getSettingsParameter();
-    
+
     /**
      * Method to get an instance of the service for the context.
+     *
      * @return an instance of the service for the context
      */
     public abstract LifeCycledService getService();
-    
+
     /**
      * Sets up the configuration.
+     *
      * @param configurationDir the configuration dir
      */
     public abstract void initialize(String configurationDir);
-    
+
     /**
      * Method called at servlet initialization.
+     *
      * @param sce the servlet context event for the initialization
      */
     public void contextInitialized(ServletContextEvent sce) {
         String confDir = sce.getServletContext().getInitParameter(getSettingsParameter());
-        if(confDir == null) {
+        if (confDir == null) {
             throw new RuntimeException("No configuration directory specified!");
         }
         log.debug("Configuration dir = " + confDir);
-        
+
         try {
             new LogbackConfigLoader(confDir + "/logback.xml");
         } catch (Exception e) {
             log.info("Failed to read log configuration file. Falling back to default.");
-        } 
+        }
         try {
             initialize(confDir);
             getService();
@@ -83,11 +86,12 @@ public void contextInitialized(ServletContextEvent sce) {
             throw e;
         }
         log.debug("Servlet context initialized");
-        
+
     }
-    
+
     /**
      * Method called at servlet shutdown.
+     *
      * @param sce the servlet context event for the shutdown
      */
     public void contextDestroyed(ServletContextEvent sce) {
diff --git a/bitrepository-service/src/main/java/org/bitrepository/service/AlarmDispatcher.java b/bitrepository-service/src/main/java/org/bitrepository/service/AlarmDispatcher.java
index a577e08b7..97abea6da 100644
--- a/bitrepository-service/src/main/java/org/bitrepository/service/AlarmDispatcher.java
+++ b/bitrepository-service/src/main/java/org/bitrepository/service/AlarmDispatcher.java
@@ -1,30 +1,29 @@
 /*
  * #%L
  * Bitrepository Integration
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.service;
 
-import java.util.UUID;
 import org.bitrepository.bitrepositoryelements.Alarm;
 import org.bitrepository.bitrepositorymessages.AlarmMessage;
 import org.bitrepository.common.ArgumentValidator;
@@ -36,77 +35,81 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Objects;
+import java.util.UUID;
+
 /**
  * The class for dispatching alarms.
  */
 public class AlarmDispatcher extends MessageDispatcher {
-    private Logger log = LoggerFactory.getLogger(getClass());
+    private final Logger log = LoggerFactory.getLogger(getClass());
     private final AlarmLevel alarmLevel;
-    
+
     /**
-     * @param sender Used for sending the alarms.
-     * @param settings The configuration.
+     * @param sender     Used for sending the alarms.
+     * @param settings   The configuration.
      * @param alarmLevel The alarm level, if null set to ERROR
      */
     public AlarmDispatcher(Settings settings, MessageSender sender, AlarmLevel alarmLevel) {
         super(settings, sender);
-        if (alarmLevel == null) {
-            this.alarmLevel = AlarmLevel.ERROR;
-        }  else {
-            this.alarmLevel = alarmLevel;
-        }
+        this.alarmLevel = Objects.requireNonNullElse(alarmLevel, AlarmLevel.ERROR);
     }
 
     /**
      * Delegates to #AlarmDispatcher(MessageSender, AlarmLevel) with a ERROR alarm level.
-     * @param sender Used for sending the alarms.
+     *
+     * @param sender   Used for sending the alarms.
      * @param settings The configuration.
      */
     public AlarmDispatcher(Settings settings, MessageSender sender) {
         this(settings, sender, AlarmLevel.ERROR);
     }
-    
+
     /**
-     * Send an alarm at warning-level. 
+     * Send an alarm at warning-level.
      * If the settings does not have alarm level at 'warning', then a log is made instead.
+     *
      * @param alarm The alarm to send.
      */
     public void warning(Alarm alarm) {
         ArgumentValidator.checkNotNull(alarm, "alarm");
-        if(alarmLevel != AlarmLevel.WARNING) {
+        if (alarmLevel != AlarmLevel.WARNING) {
             log.debug("Will send a '" + AlarmLevel.WARNING + "' alarm, when the alarm level is '"
                     + alarmLevel + "'{}", alarm);
         } else {
             sendAlarm(alarm);
         }
     }
-    
+
     /**
-     * Send an alarm at error-level. 
+     * Send an alarm at error-level.
      * If the settings does not have alarm level at 'error', then a log is made instead.
+     *
      * @param alarm The alarm to send.
      */
     public void error(Alarm alarm) {
         ArgumentValidator.checkNotNull(alarm, "alarm");
-        if(alarmLevel == AlarmLevel.EMERGENCY) {
+        if (alarmLevel == AlarmLevel.EMERGENCY) {
             log.debug("Cannot send a '" + AlarmLevel.ERROR + "' alarm, when the alarm level is '"
                     + alarmLevel + "'{}", alarm);
         } else {
             sendAlarm(alarm);
         }
     }
-        
+
     /**
      * Send an alarm at emergency-level. At this level all alarms will be sent.
+     *
      * @param alarm The alarm to send.
      */
     public void emergency(Alarm alarm) {
         ArgumentValidator.checkNotNull(alarm, "alarm");
         sendAlarm(alarm);
     }
-        
-   /**
+
+    /**
      * Method for sending an Alarm when something bad happens.
+     *
      * @param alarm The alarm to send to the destination for the alarm service.
      */
     protected void sendAlarm(Alarm alarm) {
@@ -119,7 +122,7 @@ protected void sendAlarm(Alarm alarm) {
         message.setReplyTo(settings.getContributorDestinationID());
         message.setDestination(settings.getAlarmDestination());
         message.setCollectionID(alarm.getCollectionID());
-        
+
         log.warn("Sending alarm: " + alarm);
         dispatchMessage(message);
     }
diff --git a/bitrepository-service/src/main/java/org/bitrepository/service/LifeCycledService.java b/bitrepository-service/src/main/java/org/bitrepository/service/LifeCycledService.java
index 48669bcb2..5c852c8a3 100644
--- a/bitrepository-service/src/main/java/org/bitrepository/service/LifeCycledService.java
+++ b/bitrepository-service/src/main/java/org/bitrepository/service/LifeCycledService.java
@@ -5,29 +5,31 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.service;
 
-/** Provides start() and shutdown() methods. */
+/**
+ * Provides start() and shutdown() methods.
+ */
 
 public interface LifeCycledService {
     void start();
-    
+
     /**
-     * Method called to shutdown the service. 
+     * Method called to shut down the service.
      */
     void shutdown();
 }
diff --git a/bitrepository-service/src/main/java/org/bitrepository/service/ServiceSettingsProvider.java b/bitrepository-service/src/main/java/org/bitrepository/service/ServiceSettingsProvider.java
index d296cb09c..910c45c22 100644
--- a/bitrepository-service/src/main/java/org/bitrepository/service/ServiceSettingsProvider.java
+++ b/bitrepository-service/src/main/java/org/bitrepository/service/ServiceSettingsProvider.java
@@ -1,7 +1,7 @@
 /*
-* #%L
+ * #%L
  * * Bitrepository Protocol
- * 
+ *
  * * $Id$
  * * $HeadURL$
  * *
@@ -10,20 +10,20 @@
  * *
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
-*/
+ */
 
 package org.bitrepository.service;
 
@@ -39,11 +39,11 @@ public class ServiceSettingsProvider extends SettingsProvider {
     private final ServiceType serviceType;
 
     /**
-     * Creates a <code>SettingsProvider</code> which will use the provided <code>SettingsLoader</code> for loading the
+     * Creates a {@link SettingsProvider} which will use the provided {@link SettingsLoader} for loading the
      * settings.
      *
      * @param settingsReader Use for loading the settings.
-     * @param serviceType Will be used to load a componentID for the service based on the type.
+     * @param serviceType    Will be used to load a componentID for the service based on the type.
      */
     public ServiceSettingsProvider(SettingsLoader settingsReader, ServiceType serviceType) {
         super(settingsReader, null);
diff --git a/bitrepository-service/src/main/java/org/bitrepository/service/audit/AuditDatabaseConstants.java b/bitrepository-service/src/main/java/org/bitrepository/service/audit/AuditDatabaseConstants.java
index 1472f0144..2c89ac3e1 100644
--- a/bitrepository-service/src/main/java/org/bitrepository/service/audit/AuditDatabaseConstants.java
+++ b/bitrepository-service/src/main/java/org/bitrepository/service/audit/AuditDatabaseConstants.java
@@ -1,20 +1,20 @@
 /*
  * #%L
- * Bitrepository Reference Pillar
+ * BitRepository Reference Pillar
  * %%
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -26,47 +26,81 @@
  * All the names of the tables and the fields in these tables.
  */
 public final class AuditDatabaseConstants {
-    
-    /** Private constructor to prevent instantiation of this constants class.*/
-    private AuditDatabaseConstants() { }
-    
-    /** The name of the audit trail table.*/
-    public final static String AUDITTRAIL_TABLE = "audittrail";
-    /** The name of the sequence number field in the audit trail table. */
-    public final static String AUDITTRAIL_SEQUENCE_NUMBER = "sequence_number";
-    /** The name of the file guid field in the audit trail table. */
-    public final static String AUDITTRAIL_FILE_GUID = "file_guid";
-    /** The name of the actor guid field in the audit trail table. */
-    public final static String AUDITTRAIL_ACTOR_GUID = "actor_guid";
-    /** The name of the operation field in the audit trail table. */
-    public final static String AUDITTRAIL_OPERATION = "operation";
-    /** The name of the operation date field in the audit trail table. */
-    public final static String AUDITTRAIL_OPERATION_DATE = "operation_date";
-    /** The name of the information field in the audit trail table. */
-    public final static String AUDITTRAIL_INFORMATION = "information";
-    /** The name of the information field in the audit trail table. */
-    public final static String AUDITTRAIL_OPERATIONID = "operationID";
-    /** The name of the information field in the audit trail table. */
-    public final static String AUDITTRAIL_FINGERPRINT = "fingerprint";
-    /** The name of the audit field in the audit trail table. */
-    public final static String AUDITTRAIL_AUDIT = "audit";    
-    
-    /** The name of the file table.*/
+    private AuditDatabaseConstants() {}
+
+    /**
+     * The name of the 'audit trail' table.
+     */
+    public final static String AUDIT_TRAIL_TABLE = "audittrail";
+    /**
+     * The name of the 'sequence number' field in the audit trail table.
+     */
+    public final static String AUDIT_TRAIL_SEQUENCE_NUMBER = "sequence_number";
+    /**
+     * The name of the 'file guid' field in the audit trail table.
+     */
+    public final static String AUDIT_TRAIL_FILE_GUID = "file_guid";
+    /**
+     * The name of the 'actor guid' field in the audit trail table.
+     */
+    public final static String AUDIT_TRAIL_ACTOR_GUID = "actor_guid";
+    /**
+     * The name of the 'operation' field in the audit trail table.
+     */
+    public final static String AUDIT_TRAIL_OPERATION = "operation";
+    /**
+     * The name of the 'operation date 'field in the audit trail table.
+     */
+    public final static String AUDIT_TRAIL_OPERATION_DATE = "operation_date";
+    /**
+     * The name of the information field in the audit trail table.
+     */
+    public final static String AUDIT_TRAIL_INFORMATION = "information";
+    /**
+     * The name of the information field in the audit trail table.
+     */
+    public final static String AUDIT_TRAIL_OPERATIONID = "operationID";
+    /**
+     * The name of the information field in the audit trail table.
+     */
+    public final static String AUDIT_TRAIL_FINGERPRINT = "fingerprint";
+    /**
+     * The name of the 'audit field' in the audit trail table.
+     */
+    public final static String AUDIT_TRAIL_AUDIT = "audit";
+
+    /**
+     * The name of the 'file' table.
+     */
     public final static String FILE_TABLE = "file";
-    /** The name of the file guid field in the file table.*/
+    /**
+     * The name of the 'file guid' field in the file table.
+     */
     public final static String FILE_GUID = "file_guid";
-    /** The name of the fileid field in the file table.*/
-    public final static String FILE_FILEID = "fileid";
-    /** The name of the collectionid field in the file table.*/
-    public final static String FILE_COLLECTIONID = "collectionid";
-    
-    /** The name of the actor table.*/
+    /**
+     * The name of the 'fileid' field in the file table.
+     */
+    public final static String FILE_FILE_ID = "fileid";
+    /**
+     * The name of the 'collectionid' field in the file table.
+     */
+    public final static String FILE_COLLECTION_ID = "collectionid";
+
+    /**
+     * The name of the 'actor' table.
+     */
     public final static String ACTOR_TABLE = "actor";
-    /** The name of the actor guid field in the actor table.*/
+    /**
+     * The name of the 'actor guid' field in the actor table.
+     */
     public final static String ACTOR_GUID = "actor_guid";
-    /** The name of the actor name field in the actor table.*/
+    /**
+     * The name of the 'actor name' field in the actor table.
+     */
     public final static String ACTOR_NAME = "actor_name";
-    
-    /** The name of the version table entry for the database.*/
+
+    /**
+     * The name of the version table entry for the database.
+     */
     public final static String DATABASE_VERSION_ENTRY = "auditcontributordb";
 }
diff --git a/bitrepository-service/src/main/java/org/bitrepository/service/audit/AuditDatabaseManager.java b/bitrepository-service/src/main/java/org/bitrepository/service/audit/AuditDatabaseManager.java
index 0ac0afe00..efaca8bc6 100644
--- a/bitrepository-service/src/main/java/org/bitrepository/service/audit/AuditDatabaseManager.java
+++ b/bitrepository-service/src/main/java/org/bitrepository/service/audit/AuditDatabaseManager.java
@@ -8,12 +8,12 @@
  * it under the terms of the GNU Lesser General Public License as
  * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
@@ -26,18 +26,18 @@
 import org.bitrepository.settings.referencesettings.DatabaseSpecifics;
 
 /**
- * Manager for the audit trail contributor database. For usage, see @DatabaseManager. 
+ * Manager for the audit trail contributor database. For usage, see @DatabaseManager.
  */
 public class AuditDatabaseManager extends DatabaseManager {
 
     private final DatabaseSpecifics databaseSpecifics;
     private DatabaseMigrator migrator;
     public final static String AUDIT_CONTRIBUTOR_DATABASE_SCHEMA = "sql/derby/auditContributorDBCreation.sql";
-    
+
     public AuditDatabaseManager(DatabaseSpecifics databaseSpecifics) {
         this.databaseSpecifics = databaseSpecifics;
     }
-    
+
     @Override
     protected DatabaseSpecifics getDatabaseSpecifics() {
         return databaseSpecifics;
@@ -45,7 +45,7 @@ protected DatabaseSpecifics getDatabaseSpecifics() {
 
     @Override
     protected synchronized DatabaseMigrator getMigrator() {
-        if(migrator == null) {
+        if (migrator == null) {
             migrator = new AuditTrailContributorDatabaseMigrator(connector);
         }
         return migrator;
diff --git a/bitrepository-service/src/main/java/org/bitrepository/service/audit/AuditTrailContributerDAOFactory.java b/bitrepository-service/src/main/java/org/bitrepository/service/audit/AuditTrailContributerDAOFactory.java
index e7ba8ee7f..7703d16b5 100644
--- a/bitrepository-service/src/main/java/org/bitrepository/service/audit/AuditTrailContributerDAOFactory.java
+++ b/bitrepository-service/src/main/java/org/bitrepository/service/audit/AuditTrailContributerDAOFactory.java
@@ -26,25 +26,25 @@
 import org.bitrepository.settings.referencesettings.DatabaseSpecifics;
 
 /**
- * A DatabaseFactory which can return Derby and Postgres AuditTrailContributerDAO's.
+ * A DatabaseFactory which can return Derby and Postgres AuditTrailContributorDAO's.
  *
  * FIXME: Code does not reflect generic type.
  */
-public class AuditTrailContributerDAOFactory extends DatabaseFactory<AuditTrailContributerDAO> {
+public class AuditTrailContributerDAOFactory extends DatabaseFactory<AuditTrailContributorDAO> {
 
-    public AuditTrailContributerDAO getAuditTrailContributorDAO(DatabaseSpecifics ds, String componentID) {
-        AuditTrailContributerDAO dao = getDAOInstance(ds);
+    public AuditTrailContributorDAO getAuditTrailContributorDAO(DatabaseSpecifics ds, String componentID) {
+        AuditTrailContributorDAO dao = getDAOInstance(ds);
         dao.initialize(componentID);
         return dao;
     }
     
     @Override
-    protected AuditTrailContributerDAO getDerbyDAO(DatabaseManager dm) {
+    protected AuditTrailContributorDAO getDerbyDAO(DatabaseManager dm) {
         return new DerbyAuditTrailContributorDAO(dm);
     }
 
     @Override
-    protected AuditTrailContributerDAO getPostgresDAO(DatabaseManager dm) {
+    protected AuditTrailContributorDAO getPostgresDAO(DatabaseManager dm) {
         return new PostgresAuditTrailContributorDAO(dm);
     }
 
diff --git a/bitrepository-service/src/main/java/org/bitrepository/service/audit/AuditTrailContributerDAO.java b/bitrepository-service/src/main/java/org/bitrepository/service/audit/AuditTrailContributorDAO.java
similarity index 71%
rename from bitrepository-service/src/main/java/org/bitrepository/service/audit/AuditTrailContributerDAO.java
rename to bitrepository-service/src/main/java/org/bitrepository/service/audit/AuditTrailContributorDAO.java
index f422fb6a9..872078e09 100644
--- a/bitrepository-service/src/main/java/org/bitrepository/service/audit/AuditTrailContributerDAO.java
+++ b/bitrepository-service/src/main/java/org/bitrepository/service/audit/AuditTrailContributorDAO.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -42,46 +42,43 @@
 import static org.bitrepository.service.audit.AuditDatabaseConstants.ACTOR_GUID;
 import static org.bitrepository.service.audit.AuditDatabaseConstants.ACTOR_NAME;
 import static org.bitrepository.service.audit.AuditDatabaseConstants.ACTOR_TABLE;
-import static org.bitrepository.service.audit.AuditDatabaseConstants.AUDITTRAIL_ACTOR_GUID;
-import static org.bitrepository.service.audit.AuditDatabaseConstants.AUDITTRAIL_AUDIT;
-import static org.bitrepository.service.audit.AuditDatabaseConstants.AUDITTRAIL_FILE_GUID;
-import static org.bitrepository.service.audit.AuditDatabaseConstants.AUDITTRAIL_FINGERPRINT;
-import static org.bitrepository.service.audit.AuditDatabaseConstants.AUDITTRAIL_INFORMATION;
-import static org.bitrepository.service.audit.AuditDatabaseConstants.AUDITTRAIL_OPERATION;
-import static org.bitrepository.service.audit.AuditDatabaseConstants.AUDITTRAIL_OPERATIONID;
-import static org.bitrepository.service.audit.AuditDatabaseConstants.AUDITTRAIL_OPERATION_DATE;
-import static org.bitrepository.service.audit.AuditDatabaseConstants.AUDITTRAIL_SEQUENCE_NUMBER;
-import static org.bitrepository.service.audit.AuditDatabaseConstants.AUDITTRAIL_TABLE;
-import static org.bitrepository.service.audit.AuditDatabaseConstants.FILE_COLLECTIONID;
-import static org.bitrepository.service.audit.AuditDatabaseConstants.FILE_FILEID;
+import static org.bitrepository.service.audit.AuditDatabaseConstants.AUDIT_TRAIL_ACTOR_GUID;
+import static org.bitrepository.service.audit.AuditDatabaseConstants.AUDIT_TRAIL_AUDIT;
+import static org.bitrepository.service.audit.AuditDatabaseConstants.AUDIT_TRAIL_FILE_GUID;
+import static org.bitrepository.service.audit.AuditDatabaseConstants.AUDIT_TRAIL_FINGERPRINT;
+import static org.bitrepository.service.audit.AuditDatabaseConstants.AUDIT_TRAIL_INFORMATION;
+import static org.bitrepository.service.audit.AuditDatabaseConstants.AUDIT_TRAIL_OPERATION;
+import static org.bitrepository.service.audit.AuditDatabaseConstants.AUDIT_TRAIL_OPERATIONID;
+import static org.bitrepository.service.audit.AuditDatabaseConstants.AUDIT_TRAIL_OPERATION_DATE;
+import static org.bitrepository.service.audit.AuditDatabaseConstants.AUDIT_TRAIL_SEQUENCE_NUMBER;
+import static org.bitrepository.service.audit.AuditDatabaseConstants.AUDIT_TRAIL_TABLE;
+import static org.bitrepository.service.audit.AuditDatabaseConstants.FILE_COLLECTION_ID;
+import static org.bitrepository.service.audit.AuditDatabaseConstants.FILE_FILE_ID;
 import static org.bitrepository.service.audit.AuditDatabaseConstants.FILE_GUID;
 import static org.bitrepository.service.audit.AuditDatabaseConstants.FILE_TABLE;
 
 /**
  * Access interface for communication with the audit trail database.
- *
+ * <p>
  * In the case of 'All-FileIDs', then the 'fileID' is given the string-value 'null'.
  */
-public abstract class AuditTrailContributerDAO implements AuditTrailManager {
-    /** The log.*/
-    private Logger log = LoggerFactory.getLogger(getClass());
-    /** The connection to the database.*/
-    private DBConnector dbConnector;
-    /** The componentID.*/
+public abstract class AuditTrailContributorDAO implements AuditTrailManager {
+    private final Logger log = LoggerFactory.getLogger(getClass());
+    private final DBConnector dbConnector;
     private String componentID;
 
     /**
-     * Constructor.
      * @param manager the database manager
      */
-    public AuditTrailContributerDAO(DatabaseManager manager) {
+    public AuditTrailContributorDAO(DatabaseManager manager) {
         this.dbConnector = manager.getConnector();
         getConnection();
     }
-    
+
     /**
-     * Initialization method, needed to setup the instance.
-     * @param componentID The ID of the component using the AuditTrailContributerDAO instance 
+     * Initialization method, needed to set up the instance.
+     *
+     * @param componentID The ID of the component using the AuditTrailContributorDAO instance
      */
     public void initialize(String componentID) {
         this.componentID = componentID;
@@ -89,69 +86,69 @@ public void initialize(String componentID) {
 
     /**
      * Retrieve the connection to the database.
-     * TODO improve performance (only reconnect every-so-often)... 
+     * TODO improve performance (only reconnect every-so-often)...
+     *
      * @return The connection to the database.
      * @throws IllegalStateException if the connection could not be established
      */
     protected Connection getConnection() throws IllegalStateException {
         try {
-            Connection dbConnection = dbConnector.getConnection();
-            return dbConnection;
+            return dbConnector.getConnection();
         } catch (Exception e) {
             throw new IllegalStateException("Could not instantiate the database", e);
         }
     }
-    
+
     @Override
     public void addAuditEvent(String collectionID, String fileID, String actor, String info, String auditTrail,
-            FileAction operation, String operationID, String fingerprint) {
+                              FileAction operation, String operationID, String fingerprint) {
         ArgumentValidator.checkNotNull(collectionID, "String collectionID");
         ArgumentValidator.checkNotNull(operation, "FileAction operation");
         addAuditEvent(collectionID, fileID, new Date(), actor, info, auditTrail, operation, operationID, fingerprint);
     }
-    
+
     /**
-     * Inner method to handle the insertion of audit events. 
-     * The inner method is separated out to be able to test specifics timestamps. 
+     * Inner method to handle the insertion of audit events.
+     * The inner method is separated out to be able to test specifics timestamps.
      */
-    protected void addAuditEvent(String collectionID, String fileID, Date auditTime, String actor, String info, 
-            String auditTrail, FileAction operation, String operationID, String fingerprint) {
+    protected void addAuditEvent(String collectionID, String fileID, Date auditTime, String actor, String info,
+                                 String auditTrail, FileAction operation, String operationID, String fingerprint) {
         ArgumentValidator.checkNotNull(collectionID, "String collectionID");
         ArgumentValidator.checkNotNull(operation, "FileAction operation");
         log.debug("Inserting an audit event for file '" + fileID + "', from actor '" + actor
                 + "' performing operation '" + operation + "', with the audit trail information '" + auditTrail + "'");
 
         long fileGuid;
-        if(fileID == null || fileID.isEmpty()) {
+        if (fileID == null || fileID.isEmpty()) {
             fileGuid = retrieveFileGuid(collectionID, "null");
         } else {
             fileGuid = retrieveFileGuid(collectionID, fileID);
         }
         long actorGuid;
-        if(actor == null || actor.isEmpty()) {
+        if (actor == null || actor.isEmpty()) {
             actorGuid = retrieveActorGuid("null");
         } else {
             actorGuid = retrieveActorGuid(actor);
         }
 
-        if(auditTrail == null) {
+        if (auditTrail == null) {
             auditTrail = "";
         }
-        if(info == null) {
+        if (info == null) {
             info = "";
         }
-        if(operationID == null) {
+        if (operationID == null) {
             operationID = "";
         }
-        if(fingerprint == null) {
+        if (fingerprint == null) {
             fingerprint = "";
         }
 
-        synchronized(this) {
-            String insertSql = "INSERT INTO " + AUDITTRAIL_TABLE + " ( " + AUDITTRAIL_FILE_GUID + " , "
-                    + AUDITTRAIL_ACTOR_GUID + " , " + AUDITTRAIL_OPERATION + " , " + AUDITTRAIL_OPERATION_DATE + " , "
-                    + AUDITTRAIL_AUDIT + " , " + AUDITTRAIL_INFORMATION + " , " + AUDITTRAIL_OPERATIONID + " , " +
-                    AUDITTRAIL_FINGERPRINT + " ) VALUES ( ? , ? , ? , ? , ? , ? , ? , ?)";
+        synchronized (this) {
+            String insertSql = "INSERT INTO " + AUDIT_TRAIL_TABLE + " ( " + AUDIT_TRAIL_FILE_GUID + " , "
+                    + AUDIT_TRAIL_ACTOR_GUID + " , " + AUDIT_TRAIL_OPERATION + " , " + AUDIT_TRAIL_OPERATION_DATE + " , "
+                    + AUDIT_TRAIL_AUDIT + " , " + AUDIT_TRAIL_INFORMATION + " , " + AUDIT_TRAIL_OPERATIONID + " , " +
+                    AUDIT_TRAIL_FINGERPRINT + " ) VALUES ( ? , ? , ? , ? , ? , ? , ? , ?)";
             DatabaseUtils.executeStatement(dbConnector, insertSql, fileGuid, actorGuid, operation.toString(),
                     auditTime.getTime(), auditTrail, info, operationID, fingerprint);
         }
@@ -159,23 +156,24 @@ protected void addAuditEvent(String collectionID, String fileID, Date auditTime,
 
     @Override
     public AuditTrailDatabaseResults getAudits(String collectionID, String fileID, Long minSeqNumber,
-            Long maxSeqNumber, Date minDate, Date maxDate, Long maxNumberOfResults) {
+                                               Long maxSeqNumber, Date minDate, Date maxDate, Long maxNumberOfResults) {
         return extractEvents(new AuditTrailExtractor(collectionID, fileID, minSeqNumber, maxSeqNumber, minDate,
                 maxDate, maxNumberOfResults));
     }
 
     /**
-     * Extracts the largest sequence number from the database. 
+     * Extracts the largest sequence number from the database.
+     *
      * @return The largest sequence number. If no entry exists, then zero is returned.
      */
     public Long extractLargestSequenceNumber() {
-        String sql = "SELECT " + AUDITTRAIL_SEQUENCE_NUMBER + " FROM " + AUDITTRAIL_TABLE + " ORDER BY "
-                + AUDITTRAIL_SEQUENCE_NUMBER + " DESC";
+        String sql = "SELECT " + AUDIT_TRAIL_SEQUENCE_NUMBER + " FROM " + AUDIT_TRAIL_TABLE + " ORDER BY "
+                + AUDIT_TRAIL_SEQUENCE_NUMBER + " DESC";
 
         try (Connection conn = getConnection();
              PreparedStatement ps = DatabaseUtils.createPreparedStatement(conn, sql)) {
             try (ResultSet res = ps.executeQuery()) {
-                if(!res.next()) {
+                if (!res.next()) {
                     return 0L;
                 }
                 return res.getLong(1);
@@ -186,15 +184,17 @@ public Long extractLargestSequenceNumber() {
 
         }
     }
-    
+
     /**
      * Method to obtain the database specific sql to limit the number of results.
-     * @return string The database specific SQL to limit the number of results in a database query 
+     *
+     * @return string The database specific SQL to limit the number of results in a database query
      */
     protected abstract String createQueryResultsLimit();
 
     /**
      * Extracts the the audit trail information based on the given sql query and arguments.
+     *
      * @param extractor The entity for extracting the audit trails.
      * @return The extracted audit trails.
      */
@@ -209,29 +209,29 @@ private AuditTrailDatabaseResults extractEvents(AuditTrailExtractor extractor) {
         final int infoPosition = 7;
         final int operationIDPosition = 8;
         final int fingerprintPosition = 9;
-        
-        String sql = "SELECT "  + AUDITTRAIL_SEQUENCE_NUMBER + ", " 
-                                + FILE_FILEID + " , "
-                                + AUDITTRAIL_ACTOR_GUID + " , " 
-                                + AUDITTRAIL_OPERATION_DATE + " , " 
-                                + AUDITTRAIL_OPERATION + " , "
-                                + AUDITTRAIL_AUDIT + " , " 
-                                + AUDITTRAIL_INFORMATION + " , " 
-                                + AUDITTRAIL_OPERATIONID + " , "
-                                + AUDITTRAIL_FINGERPRINT 
-                                + " FROM " 
-                                + AUDITTRAIL_TABLE + " JOIN " + FILE_TABLE 
-                                + " ON " + AUDITTRAIL_TABLE + "." + AUDITTRAIL_FILE_GUID + " = " 
-                                + FILE_TABLE + "." + FILE_GUID
-                                + " " + extractor.createRestriction();
+
+        String sql = "SELECT " + AUDIT_TRAIL_SEQUENCE_NUMBER + ", "
+                + FILE_FILE_ID + " , "
+                + AUDIT_TRAIL_ACTOR_GUID + " , "
+                + AUDIT_TRAIL_OPERATION_DATE + " , "
+                + AUDIT_TRAIL_OPERATION + " , "
+                + AUDIT_TRAIL_AUDIT + " , "
+                + AUDIT_TRAIL_INFORMATION + " , "
+                + AUDIT_TRAIL_OPERATIONID + " , "
+                + AUDIT_TRAIL_FINGERPRINT
+                + " FROM "
+                + AUDIT_TRAIL_TABLE + " JOIN " + FILE_TABLE
+                + " ON " + AUDIT_TRAIL_TABLE + "." + AUDIT_TRAIL_FILE_GUID + " = "
+                + FILE_TABLE + "." + FILE_GUID
+                + " " + extractor.createRestriction();
 
         AuditTrailDatabaseResults auditResults = new AuditTrailDatabaseResults();
         try (Connection conn = getConnection();
              PreparedStatement ps = DatabaseUtils.createPreparedStatement(conn, sql, extractor.getArguments())) {
             conn.setAutoCommit(false);
             ps.setFetchSize(100);
-            try (ResultSet results = ps.executeQuery()) {     
-                while(results.next()) {
+            try (ResultSet results = ps.executeQuery()) {
+                while (results.next()) {
                     AuditTrailEvent event = new AuditTrailEvent();
 
                     event.setSequenceNumber(BigInteger.valueOf(results.getLong(sequencePosition)));
@@ -246,9 +246,9 @@ private AuditTrailDatabaseResults extractEvents(AuditTrailExtractor extractor) {
                     event.setCertificateID(results.getString(fingerprintPosition));
                     auditResults.addAuditTrailEvent(event);
                 }
-                
+
                 Long maxResults = extractor.getMaxResults();
-                if(maxResults != null && auditResults.getAuditTrailEvents().getAuditTrailEvent().size() >= maxResults) {
+                if (maxResults != null && auditResults.getAuditTrailEvents().getAuditTrailEvent().size() >= maxResults) {
                     log.debug("More than the maximum {} results found.", maxResults);
                     auditResults.reportMoreResultsFound();
                 }
@@ -267,24 +267,24 @@ private AuditTrailDatabaseResults extractEvents(AuditTrailExtractor extractor) {
      * Retrieve the guid for a given file id. If the file id does not exist within the table, then it is created.
      *
      * @param collectionID The collection id for the file.
-     * @param fileID The id of the file to retrieve.
+     * @param fileID       The id of the file to retrieve.
      * @return The guid for the given file id.
      */
     private synchronized long retrieveFileGuid(String collectionID, String fileID) {
-        String sqlRetrieve = "SELECT " + FILE_GUID + " FROM " + FILE_TABLE + " WHERE " + FILE_FILEID + " = ? AND " 
-                + FILE_COLLECTIONID + " = ?";
+        String sqlRetrieve = "SELECT " + FILE_GUID + " FROM " + FILE_TABLE + " WHERE " + FILE_FILE_ID + " = ? AND "
+                + FILE_COLLECTION_ID + " = ?";
 
         Long guid = DatabaseUtils.selectLongValue(dbConnector, sqlRetrieve, fileID, collectionID);
 
-        if(guid == null) {
+        if (guid == null) {
             log.debug("Inserting fileid '" + fileID + "' into the file table.");
-            String sqlInsert = "INSERT INTO " + FILE_TABLE + " ( " + FILE_FILEID + " , " + FILE_COLLECTIONID 
+            String sqlInsert = "INSERT INTO " + FILE_TABLE + " ( " + FILE_FILE_ID + " , " + FILE_COLLECTION_ID
                     + " ) VALUES ( ? , ? )";
             DatabaseUtils.executeStatement(dbConnector, sqlInsert, fileID, collectionID);
 
             guid = DatabaseUtils.selectLongValue(dbConnector, sqlRetrieve, fileID, collectionID);
         }
-
+        assert guid != null;
         return guid;
     }
 
@@ -299,19 +299,20 @@ private synchronized long retrieveActorGuid(String actorName) {
 
         Long guid = DatabaseUtils.selectLongValue(dbConnector, sqlRetrieve, actorName);
 
-        if(guid == null) {
+        if (guid == null) {
             log.debug("Inserting actor '" + actorName + "' into the actor table.");
             String sqlInsert = "INSERT INTO " + ACTOR_TABLE + " ( " + ACTOR_NAME + " ) VALUES ( ? )";
             DatabaseUtils.executeStatement(dbConnector, sqlInsert, actorName);
 
             guid = DatabaseUtils.selectLongValue(dbConnector, sqlRetrieve, actorName);
         }
-
+        assert guid != null;
         return guid;
     }
 
     /**
-     * Retrieves a name of an actor based on the guid. 
+     * Retrieves a name of an actor based on the guid.
+     *
      * @param actorGuid The guid of the actor.
      * @return The name of the actor corresponding to guid.
      */
@@ -322,23 +323,16 @@ private String retrieveActorName(long actorGuid) {
     }
 
     /**
-     * Class for encapsulating the request for extracting.
+     * Private class for encapsulating the request for extracting.
      */
     private class AuditTrailExtractor {
-        /** The collection id limitation for the request.*/
-        private String collectionID;
-        /** The file id limitation for the request. */
-        private String fileID;
-        /** The minimum sequence number limitation for the request.*/
-        private Long minSeqNumber;
-        /** The maximum sequence number limitation for the request.*/
-        private Long maxSeqNumber;
-        /** The minimum date limitation for the request.*/
-        private Date minDate;
-        /** The maxmimum date limitation for the request.*/
-        private Date maxDate;
-        /** The maximum number of results. */
-        private Long maxResults;
+        private final String collectionID;
+        private final String fileID;
+        private final Long minSeqNumber;
+        private final Long maxSeqNumber;
+        private final Date minDate;
+        private final Date maxDate;
+        private final Long maxResults;
 
         /**
          * @param collectionID The id of the collection to retrieve the audit trails for.
@@ -359,7 +353,7 @@ public AuditTrailExtractor(String collectionID, String fileID, Long minSeqNumber
             this.maxDate = maxDate;
             this.maxResults = maxResults;
         }
-        
+
         /**
          * @return the maximum number of results as a Long.
          */
@@ -372,46 +366,46 @@ public Long getMaxResults() {
          */
         public String createRestriction() {
             // Handle the case with no restrictions.
-            if(collectionID == null && fileID == null && minSeqNumber == null && maxSeqNumber == null
+            if (collectionID == null && fileID == null && minSeqNumber == null && maxSeqNumber == null
                     && minDate == null && maxDate == null && maxResults == null) {
                 return "";
             }
 
             StringBuilder res = new StringBuilder();
 
-            if(collectionID != null) {
+            if (collectionID != null) {
                 nextArgument(res);
-                res.append(FILE_COLLECTIONID + " = ?");
+                res.append(FILE_COLLECTION_ID + " = ?");
             }
 
-            if(fileID != null) {
+            if (fileID != null) {
                 nextArgument(res);
-                res.append(FILE_FILEID + " = ?");
+                res.append(FILE_FILE_ID + " = ?");
             }
 
-            if(minSeqNumber != null) {
+            if (minSeqNumber != null) {
                 nextArgument(res);
-                res.append(AUDITTRAIL_SEQUENCE_NUMBER + " >= ?");
+                res.append(AUDIT_TRAIL_SEQUENCE_NUMBER + " >= ?");
             }
 
-            if(maxSeqNumber != null) {
+            if (maxSeqNumber != null) {
                 nextArgument(res);
-                res.append(AUDITTRAIL_SEQUENCE_NUMBER + " <= ?");
+                res.append(AUDIT_TRAIL_SEQUENCE_NUMBER + " <= ?");
             }
 
-            if(minDate != null) {
+            if (minDate != null) {
                 nextArgument(res);
-                res.append(AUDITTRAIL_OPERATION_DATE + " >= ?");
+                res.append(AUDIT_TRAIL_OPERATION_DATE + " >= ?");
             }
 
-            if(maxDate != null) {
+            if (maxDate != null) {
                 nextArgument(res);
-                res.append(AUDITTRAIL_OPERATION_DATE + " <= ?");
+                res.append(AUDIT_TRAIL_OPERATION_DATE + " <= ?");
             }
-            
-            res.append(" ORDER BY " + AUDITTRAIL_SEQUENCE_NUMBER);
-            
-            if(maxResults != null) {
+
+            res.append(" ORDER BY " + AUDIT_TRAIL_SEQUENCE_NUMBER);
+
+            if (maxResults != null) {
                 res.append(createQueryResultsLimit());
             }
 
@@ -420,10 +414,11 @@ public String createRestriction() {
 
         /**
          * Adds either ' AND ' or 'WHERE ' depending on whether it is the first restriction.
+         *
          * @param res The StringBuilder where the restrictions are combined.
          */
         private void nextArgument(StringBuilder res) {
-            if(res.length() > 0) {
+            if (res.length() > 0) {
                 res.append(" AND ");
             } else {
                 res.append("WHERE ");
@@ -435,28 +430,28 @@ private void nextArgument(StringBuilder res) {
          */
         public Object[] getArguments() {
             List<Object> res = new ArrayList<>();
-            if(collectionID != null) {
+            if (collectionID != null) {
                 res.add(collectionID);
             }
-            if(fileID != null) {
+            if (fileID != null) {
                 res.add(fileID);
             }
-            if(minSeqNumber != null) {
+            if (minSeqNumber != null) {
                 res.add(minSeqNumber);
             }
-            if(maxSeqNumber != null) {
+            if (maxSeqNumber != null) {
                 res.add(maxSeqNumber);
             }
-            if(minDate != null) {
+            if (minDate != null) {
                 res.add(minDate.getTime());
             }
-            if(maxDate != null) {
+            if (maxDate != null) {
                 res.add(maxDate.getTime());
             }
-            if(maxResults != null) {
+            if (maxResults != null) {
                 res.add(maxResults);
             }
-                
+
             return res.toArray();
         }
     }
diff --git a/bitrepository-service/src/main/java/org/bitrepository/service/audit/AuditTrailContributorDatabaseMigrator.java b/bitrepository-service/src/main/java/org/bitrepository/service/audit/AuditTrailContributorDatabaseMigrator.java
index 176fc5632..67c284627 100644
--- a/bitrepository-service/src/main/java/org/bitrepository/service/audit/AuditTrailContributorDatabaseMigrator.java
+++ b/bitrepository-service/src/main/java/org/bitrepository/service/audit/AuditTrailContributorDatabaseMigrator.java
@@ -5,85 +5,76 @@
  * Copyright (C) 2010 - 2013 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.service.audit;
 
-import java.util.Map;
-
 import org.bitrepository.service.database.DBConnector;
 import org.bitrepository.service.database.DatabaseMigrator;
 import org.bitrepository.service.database.DatabaseUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Map;
+
 import static org.bitrepository.service.audit.AuditDatabaseConstants.DATABASE_VERSION_ENTRY;
 import static org.bitrepository.service.audit.AuditDatabaseConstants.FILE_TABLE;
 
 /**
- * Migration class for the AuditTrailContributorDatabase of the ReferencePillar, ChecksumPillar 
+ * Migration class for the AuditTrailContributorDatabase of the ReferencePillar, ChecksumPillar
  * and the IntegrityService.
  * Will only try to perform the migration on an embedded derby database.
  */
 public class AuditTrailContributorDatabaseMigrator extends DatabaseMigrator {
-    /** The log.*/
     private static final Logger log = LoggerFactory.getLogger(DatabaseUtils.class);
-    
-    /** The name of the script for updating the database from version 1 to 2.*/
     private static final String UPDATE_SCRIPT_VERSION_1_TO_2 = "sql/derby/auditContributorDBUpdate1to2.sql";
-    /** The name of the script for updating the database from version 2 to 3.*/
     private static final String UPDATE_SCRIPT_VERSION_2_TO_3 = "sql/derby/auditContributorDBUpdate2to3.sql";
-    /** The name of the script for updating the database from version 3 to 4.*/
     private static final String UPDATE_SCRIPT_VERSION_3_TO_4 = "sql/derby/auditContributorDBUpdate3to4.sql";
-    /** The name of the script for updating the database from version 4 to 5.*/
     private static final String UPDATE_SCRIPT_VERSION_4_TO_5 = "sql/derby/auditContributorDBUpdate4to5.sql";
-    /** The current version of the database. */
     public static final int CURRENT_VERSION = 5;
-    
+
     /**
-     * Constructor.
      * @param connector connection to the database.
      */
     public AuditTrailContributorDatabaseMigrator(DBConnector connector) {
         super(connector);
     }
-    
+
     @Override
     public void migrate() {
         Map<String, Integer> versions = getTableVersions();
-        
-        if(!versions.containsKey(FILE_TABLE)) {
-            throw new IllegalStateException("The database does not contain '" + FILE_TABLE 
-                    + "' table as required.");
+
+        if (!versions.containsKey(FILE_TABLE)) {
+            throw new IllegalStateException("The database does not contain '" + FILE_TABLE + "' table as required.");
         }
-        if(versions.get(FILE_TABLE) == 1) {
+        if (versions.get(FILE_TABLE) == 1) {
             log.warn("Migrating AuditContributorDB from version 1 to 2.");
             migrateDerbyDatabase(UPDATE_SCRIPT_VERSION_1_TO_2);
         }
-        
-        if(!versions.containsKey(DATABASE_VERSION_ENTRY) || versions.get(DATABASE_VERSION_ENTRY) < 3) {
+
+        if (!versions.containsKey(DATABASE_VERSION_ENTRY) || versions.get(DATABASE_VERSION_ENTRY) < 3) {
             log.warn("Migrating AuditContributorDB from version 2 to 3.");
             migrateDerbyDatabase(UPDATE_SCRIPT_VERSION_2_TO_3);
         }
 
-        if(!versions.containsKey(DATABASE_VERSION_ENTRY) || versions.get(DATABASE_VERSION_ENTRY) < 4) {
+        if (!versions.containsKey(DATABASE_VERSION_ENTRY) || versions.get(DATABASE_VERSION_ENTRY) < 4) {
             log.warn("Migrating AuditContributorDB from version 3 to 4.");
             migrateDerbyDatabase(UPDATE_SCRIPT_VERSION_3_TO_4);
         }
-        
-        if(!versions.containsKey(DATABASE_VERSION_ENTRY) || versions.get(DATABASE_VERSION_ENTRY) < 5) {
+
+        if (!versions.containsKey(DATABASE_VERSION_ENTRY) || versions.get(DATABASE_VERSION_ENTRY) < 5) {
             log.warn("Migrating AuditContributorDB from version 4 to 5.");
             migrateDerbyDatabase(UPDATE_SCRIPT_VERSION_4_TO_5);
         }
@@ -92,14 +83,10 @@ public void migrate() {
     @Override
     public boolean needsMigration() {
         Map<String, Integer> versions = getTableVersions();
-        
-        if(!versions.containsKey(DATABASE_VERSION_ENTRY)) {
+
+        if (!versions.containsKey(DATABASE_VERSION_ENTRY)) {
             // Special case, as the first version of the database did not have DATABASE_VERSION_ENTRY!
             return true;
-        } else if(versions.get(DATABASE_VERSION_ENTRY) < CURRENT_VERSION) {
-            return true;
-        } else {
-            return false;
-        }
+        } else return versions.get(DATABASE_VERSION_ENTRY) < CURRENT_VERSION;
     }
 }
diff --git a/bitrepository-service/src/main/java/org/bitrepository/service/audit/AuditTrailDatabaseResults.java b/bitrepository-service/src/main/java/org/bitrepository/service/audit/AuditTrailDatabaseResults.java
index 2eb516483..76413920a 100644
--- a/bitrepository-service/src/main/java/org/bitrepository/service/audit/AuditTrailDatabaseResults.java
+++ b/bitrepository-service/src/main/java/org/bitrepository/service/audit/AuditTrailDatabaseResults.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -31,55 +31,49 @@
  * Contains both the audit trails and whether more results was found.
  */
 public class AuditTrailDatabaseResults {
-    /** The log.*/
-    private Logger log = LoggerFactory.getLogger(getClass());
-
-    /** The collection of audit trail events.*/
+    private final Logger log = LoggerFactory.getLogger(getClass());
     private final AuditTrailEvents events;
-    /** Whether more results has been reported.*/ 
     private boolean hasMoreResults;
-    
-    /**
-     * Constructor.
-     */
+
     public AuditTrailDatabaseResults() {
         events = new AuditTrailEvents();
         hasMoreResults = false;
     }
-    
+
     /**
      * @return The entity for containing the audit trail events.
      */
     public AuditTrailEvents getAuditTrailEvents() {
         return events;
     }
-    
+
     /**
      * Adding an audit trail event to this result set.
+     *
      * @param event The audit trail event to add.
      */
     public void addAuditTrailEvent(AuditTrailEvent event) {
         log.trace("Adding audit trail event to results: {}", event);
         events.getAuditTrailEvent().add(event);
     }
-    
+
     /**
      * @return Whether more results has been reported.
      */
     public boolean moreResults() {
         return hasMoreResults;
     }
-    
+
     /**
      * Sets that more results has been found.
      */
     public void reportMoreResultsFound() {
         hasMoreResults = true;
     }
-    
+
     @Override
     public String toString() {
-        return super.toString() + ", contains " + events.getAuditTrailEvent().size() 
+        return super.toString() + ", contains " + events.getAuditTrailEvent().size()
                 + " audit trail events, and " + (hasMoreResults ? "has more results" : "does not have more results");
     }
 }
diff --git a/bitrepository-service/src/main/java/org/bitrepository/service/audit/AuditTrailManager.java b/bitrepository-service/src/main/java/org/bitrepository/service/audit/AuditTrailManager.java
index d58c757eb..b00873f99 100644
--- a/bitrepository-service/src/main/java/org/bitrepository/service/audit/AuditTrailManager.java
+++ b/bitrepository-service/src/main/java/org/bitrepository/service/audit/AuditTrailManager.java
@@ -1,63 +1,65 @@
 /*
  * #%L
  * Bitmagasin integrationstest
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.service.audit;
 
-import java.util.Date;
-
 import org.bitrepository.bitrepositoryelements.FileAction;
 
+import java.util.Date;
+
 /**
  * The interface for the audit trail handler.
  */
 public interface AuditTrailManager {
     /**
      * Adds an audit trail event to the manager.
-     * @param collectionID The id of the collection for whom the audit applies.
-     * @param fileID The id of the file, where the operation has been performed.
-     * Use the argument null for indicating all file ids. 
-     * @param actor The name of the actor.
-     * @param info Information about the reason for the audit trail to be logged.
-     * @param auditTrail The string for the audit trail information from the message performing the operation.
-     * @param operation The performed operation.
-     * @param operationID The conversationID of the operation
+     *
+     * @param collectionID  The id of the collection for whom the audit applies.
+     * @param fileID        The id of the file, where the operation has been performed.
+     *                      Use the argument null for indicating all file ids.
+     * @param actor         The name of the actor.
+     * @param info          Information about the reason for the audit trail to be logged.
+     * @param auditTrail    The string for the audit trail information from the message performing the operation.
+     * @param operation     The performed operation.
+     * @param operationID   The conversationID of the operation
      * @param certificateID The certificate fingerprint for the message.
      */
     void addAuditEvent(String collectionID, String fileID, String actor, String info, String auditTrail,
                        FileAction operation, String operationID, String certificateID);
-    
+
     /**
      * Method for extracting all the audit trails.
-     * @param collectionID The id of the collection for whom the audit applies.
-     * @param fileID [OPTIONAL] The id of the file to request audits for.
-     * @param minSeqNumber [OPTIONAL] The lower sequence number requested. 
-     * @param maxSeqNumber [OPTIONAL] The upper sequence number requested.
-     * @param minDate [OPTIONAL] The earliest date requested.
-     * @param maxDate [OPTIONAL] The newest date requested.
+     *
+     * @param collectionID       The id of the collection for whom the audit applies.
+     * @param fileID             [OPTIONAL] The id of the file to request audits for.
+     * @param minSeqNumber       [OPTIONAL] The lower sequence number requested.
+     * @param maxSeqNumber       [OPTIONAL] The upper sequence number requested.
+     * @param minDate            [OPTIONAL] The earliest date requested.
+     * @param maxDate            [OPTIONAL] The newest date requested.
      * @param maxNumberOfResults [OPTIONAL] The maximum number of results.
      * @return The audit trails corresponding to the requested arguments.
      */
     AuditTrailDatabaseResults getAudits(String collectionID, String fileID, Long minSeqNumber, Long maxSeqNumber, Date minDate,
-            Date maxDate, Long maxNumberOfResults);
+                                        Date maxDate, Long maxNumberOfResults);
 }
diff --git a/bitrepository-service/src/main/java/org/bitrepository/service/audit/DerbyAuditTrailContributorDAO.java b/bitrepository-service/src/main/java/org/bitrepository/service/audit/DerbyAuditTrailContributorDAO.java
index 68e8722b7..fc233b978 100644
--- a/bitrepository-service/src/main/java/org/bitrepository/service/audit/DerbyAuditTrailContributorDAO.java
+++ b/bitrepository-service/src/main/java/org/bitrepository/service/audit/DerbyAuditTrailContributorDAO.java
@@ -8,12 +8,12 @@
  * it under the terms of the GNU Lesser General Public License as
  * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
@@ -24,9 +24,9 @@
 import org.bitrepository.service.database.DatabaseManager;
 
 /**
- * AuditTrailContributerDAO which knows how to ask Derby to limit the number of results returned.
+ * AuditTrailContributorDAO which knows how to ask Derby to limit the number of results returned.
  */
-public class DerbyAuditTrailContributorDAO extends AuditTrailContributerDAO {
+public class DerbyAuditTrailContributorDAO extends AuditTrailContributorDAO {
 
     public DerbyAuditTrailContributorDAO(DatabaseManager manager) {
         super(manager);
diff --git a/bitrepository-service/src/main/java/org/bitrepository/service/audit/PostgresAuditTrailContributorDAO.java b/bitrepository-service/src/main/java/org/bitrepository/service/audit/PostgresAuditTrailContributorDAO.java
index 925277124..48c725cae 100644
--- a/bitrepository-service/src/main/java/org/bitrepository/service/audit/PostgresAuditTrailContributorDAO.java
+++ b/bitrepository-service/src/main/java/org/bitrepository/service/audit/PostgresAuditTrailContributorDAO.java
@@ -8,12 +8,12 @@
  * it under the terms of the GNU Lesser General Public License as
  * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
@@ -24,10 +24,10 @@
 import org.bitrepository.service.database.DatabaseManager;
 
 /**
- * AuditTrailContributerDAO which knows how to ask Postgres to limit the number of results returned.
+ * AuditTrailContributorDAO which knows how to ask Postgres to limit the number of results returned.
  */
 
-public class PostgresAuditTrailContributorDAO extends AuditTrailContributerDAO {
+public class PostgresAuditTrailContributorDAO extends AuditTrailContributorDAO {
 
     public PostgresAuditTrailContributorDAO(DatabaseManager manager) {
         super(manager);
diff --git a/bitrepository-service/src/main/java/org/bitrepository/service/contributor/AbstractContributorMediator.java b/bitrepository-service/src/main/java/org/bitrepository/service/contributor/AbstractContributorMediator.java
index bd0548ab8..9827afd5a 100644
--- a/bitrepository-service/src/main/java/org/bitrepository/service/contributor/AbstractContributorMediator.java
+++ b/bitrepository-service/src/main/java/org/bitrepository/service/contributor/AbstractContributorMediator.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -40,18 +40,13 @@
  */
 @SuppressWarnings("rawtypes")
 public abstract class AbstractContributorMediator implements ContributorMediator {
-    /** The log.*/
-    private Logger log = LoggerFactory.getLogger(getClass());
-    /** The map of request handlers. Mapping between request name and message handler for the given request.*/
+    private final Logger log = LoggerFactory.getLogger(getClass());
     private final Map<String, RequestHandler> handlerMap = new HashMap<>();
-    /** The message bus.*/
     private final MessageBus messageBus;
-    /** The intermediate message handler for retrieving the messages from the messagebus. */
     private final GeneralRequestHandler messageHandler;
 
     /**
-     * Constructor.
-     * @param messageBus The messagebus for this mediator.
+     * @param messageBus The message-bus for this mediator.
      */
     public AbstractContributorMediator(MessageBus messageBus) {
         this.messageBus = messageBus;
@@ -71,7 +66,7 @@ public final void start() {
     }
 
     /**
-     * @return The set of <code>RequestHandler</code>s used for this contributor.
+     * @return The a <code>RequestHandler</code> array used for this contributor.
      */
     protected abstract RequestHandler[] createListOfHandlers();
 
@@ -79,13 +74,14 @@ public final void start() {
      * @return The concrete context used for this contributor.
      */
     protected abstract ContributorContext getContext();
-    
+
     /**
-     * Make the inheriting class create the environment for safely handling the request. 
+     * Make the inheriting class create the environment for safely handling the request.
      * E.g. creating the specific fault barrier.
-     * @param request The request to handle.
+     *
+     * @param request        The request to handle.
      * @param messageContext the message context
-     * @param handler The handler for the request.
+     * @param handler        The handler for the request.
      */
     protected abstract void handleRequest(MessageRequest request, MessageContext messageContext, RequestHandler handler);
 
@@ -103,17 +99,17 @@ public void onMessage(Message message, MessageContext messageContext) {
                     if (MessageUtils.isIdentifyRequest(message)) {
                         log.trace("Received unhandled identity request: \n{}", message);
                     } else
-                    log.warn("Unable to handle messages of this type: \n{}", message);
+                        log.warn("Unable to handle messages of this type: \n{}", message);
                 }
             } else {
                 log.trace("Can only handle message requests, but received: \n{}", message);
             }
         }
     }
-    
+
     /**
-    * Closes the mediator by removing all the message handler.
-    */
+     * Closes the mediator by removing all the message handler.
+     */
     @Override
     public void close() {
         messageBus.removeListener(getContext().getSettings().getCollectionDestination(), messageHandler);
diff --git a/bitrepository-service/src/main/java/org/bitrepository/service/contributor/ContributorContext.java b/bitrepository-service/src/main/java/org/bitrepository/service/contributor/ContributorContext.java
index 59b04a9de..9caacacd0 100644
--- a/bitrepository-service/src/main/java/org/bitrepository/service/contributor/ContributorContext.java
+++ b/bitrepository-service/src/main/java/org/bitrepository/service/contributor/ContributorContext.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -36,7 +36,8 @@ public class ContributorContext {
 
     public ContributorContext(ResponseDispatcher responseDispatcher, AlarmDispatcher alarmDispatcher, Settings settings,
                               FileExchange fileExchange) {
-        this.responseDispatcher = responseDispatcher; this.alarmDispatcher = alarmDispatcher;
+        this.responseDispatcher = responseDispatcher;
+        this.alarmDispatcher = alarmDispatcher;
         this.settings = settings;
         this.fileExchange = fileExchange;
     }
diff --git a/bitrepository-service/src/main/java/org/bitrepository/service/contributor/ContributorMediator.java b/bitrepository-service/src/main/java/org/bitrepository/service/contributor/ContributorMediator.java
index c00b776d6..1a2f0897e 100644
--- a/bitrepository-service/src/main/java/org/bitrepository/service/contributor/ContributorMediator.java
+++ b/bitrepository-service/src/main/java/org/bitrepository/service/contributor/ContributorMediator.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -30,7 +30,7 @@ public interface ContributorMediator {
      * Start the mediator before use.
      */
     void start();
-    
+
     /**
      * Close the mediator after use.
      */
diff --git a/bitrepository-service/src/main/java/org/bitrepository/service/contributor/MessageDispatcher.java b/bitrepository-service/src/main/java/org/bitrepository/service/contributor/MessageDispatcher.java
index 7bf85fdb8..fff8b90ad 100644
--- a/bitrepository-service/src/main/java/org/bitrepository/service/contributor/MessageDispatcher.java
+++ b/bitrepository-service/src/main/java/org/bitrepository/service/contributor/MessageDispatcher.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -28,7 +28,7 @@
 import org.bitrepository.protocol.messagebus.MessageSender;
 
 /**
- * Provides the general functionality for sending reponses from a pillar.
+ * Provides the general functionality for sending responses from a pillar.
  */
 public class MessageDispatcher {
     protected final Settings settings;
@@ -52,7 +52,7 @@ public MessageDispatcher(Settings settings, MessageSender sender) {
      * <li> Version </li>
      * </ul>
      *
-     * @param message The message which only needs the basic information to be send.
+     * @param message The message which only needs the basic information to be sent.
      */
     protected void dispatchMessage(Message message) {
         message.setFrom(settings.getComponentID());
diff --git a/bitrepository-service/src/main/java/org/bitrepository/service/contributor/ResponseDispatcher.java b/bitrepository-service/src/main/java/org/bitrepository/service/contributor/ResponseDispatcher.java
index 33c80c6e8..c9ae5b3fb 100644
--- a/bitrepository-service/src/main/java/org/bitrepository/service/contributor/ResponseDispatcher.java
+++ b/bitrepository-service/src/main/java/org/bitrepository/service/contributor/ResponseDispatcher.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -27,7 +27,7 @@
 import org.bitrepository.protocol.messagebus.MessageSender;
 
 /**
- * Provides the general functionality for sending reponses from a contributor.
+ * Provides the general functionality for sending responses from a contributor.
  */
 public class ResponseDispatcher extends MessageDispatcher {
 
@@ -49,8 +49,8 @@ public ResponseDispatcher(Settings settings, MessageSender sender) {
      *     <li>Version</li>
      * </ul>
      *
-     * @param response The response which only needs the basic information to be send.
-     * @param request The original request to respond to.
+     * @param response The response which only needs the basic information to be sent.
+     * @param request  The original request to respond to.
      */
     public void dispatchResponse(MessageResponse response, MessageRequest request) {
         response.setCorrelationID(request.getCorrelationID());
diff --git a/bitrepository-service/src/main/java/org/bitrepository/service/contributor/SimpleContributorMediator.java b/bitrepository-service/src/main/java/org/bitrepository/service/contributor/SimpleContributorMediator.java
index 86b15c6a3..69979e24b 100644
--- a/bitrepository-service/src/main/java/org/bitrepository/service/contributor/SimpleContributorMediator.java
+++ b/bitrepository-service/src/main/java/org/bitrepository/service/contributor/SimpleContributorMediator.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -46,19 +46,18 @@
 /**
  * Simple implementation of a contributor mediator.
  * It supports the handling of the GetStatus and GetAuditTrail operations.
- * 
- * If the optional AuditTrailManager is given as argument, then this mediator will also be able to handle the 
- * GetAuditTrails identification and operation. 
+ * <p>
+ * If the optional AuditTrailManager is given as argument, then this mediator will also be able to handle the
+ * GetAuditTrails identification and operation.
  */
 public class SimpleContributorMediator extends AbstractContributorMediator {
     private final Logger log = LoggerFactory.getLogger(getClass());
     private final ContributorContext context;
-    private AuditTrailManager auditManager;
-    
+    private final AuditTrailManager auditManager;
+
     /**
-     * Constructor.
-     * @param messageBus The messagebus for the mediator.
-     * @param settings the settings for the mediator.
+     * @param messageBus   The message-bus for the mediator.
+     * @param settings     the settings for the mediator.
      * @param auditManager [OPTIONAL] The manager of audit trails. Only if the contributor has audit trails.
      * @param fileExchange the file exchange
      */
@@ -66,9 +65,9 @@ public SimpleContributorMediator(
             MessageBus messageBus, Settings settings, AuditTrailManager auditManager, FileExchange fileExchange) {
         super(messageBus);
         context = new ContributorContext(
-            new ResponseDispatcher(settings, messageBus),
-            new AlarmDispatcher(settings, messageBus),
-            settings, fileExchange);
+                new ResponseDispatcher(settings, messageBus),
+                new AlarmDispatcher(settings, messageBus),
+                settings, fileExchange);
         this.auditManager = auditManager;
     }
 
@@ -76,24 +75,24 @@ public SimpleContributorMediator(
     @Override
     protected RequestHandler[] createListOfHandlers() {
         List<RequestHandler> handlers = new ArrayList<>();
-        
+
         handlers.add(new IdentifyContributorsForGetStatusRequestHandler(getContext()));
         handlers.add(new GetStatusRequestHandler(getContext()));
-        
-        if(auditManager != null) {
+
+        if (auditManager != null) {
             handlers.add(new IdentifyContributorsForGetAuditTrailsRequestHandler(getContext()));
             handlers.add(new GetAuditTrailsRequestHandler(getContext(), auditManager));
         }
-        
-        return handlers.toArray(new RequestHandler[handlers.size()]);
+
+        return handlers.toArray(new RequestHandler[0]);
     }
-    
+
     @Override
     protected ContributorContext getContext() {
         return context;
     }
 
-    @SuppressWarnings({ "rawtypes", "unchecked" })
+    @SuppressWarnings({"rawtypes", "unchecked"})
     @Override
     protected void handleRequest(MessageRequest request, MessageContext messageContext, RequestHandler handler) {
         try {
@@ -108,7 +107,7 @@ protected void handleRequest(MessageRequest request, MessageContext messageConte
             ResponseInfo responseInfo = new ResponseInfo();
             responseInfo.setResponseCode(ResponseCode.FAILURE);
             responseInfo.setResponseText(e.toString());
-            
+
             MessageResponse response = handler.generateFailedResponse(request);
             response.setResponseInfo(responseInfo);
             context.getResponseDispatcher().dispatchResponse(response, request);
diff --git a/bitrepository-service/src/main/java/org/bitrepository/service/contributor/handler/AbstractRequestHandler.java b/bitrepository-service/src/main/java/org/bitrepository/service/contributor/handler/AbstractRequestHandler.java
index 7da84a0f8..1b4a21239 100644
--- a/bitrepository-service/src/main/java/org/bitrepository/service/contributor/handler/AbstractRequestHandler.java
+++ b/bitrepository-service/src/main/java/org/bitrepository/service/contributor/handler/AbstractRequestHandler.java
@@ -5,50 +5,43 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.service.contributor.handler;
 
-import java.math.BigInteger;
-
 import org.bitrepository.bitrepositorymessages.MessageRequest;
 import org.bitrepository.bitrepositorymessages.MessageResponse;
 import org.bitrepository.common.ArgumentValidator;
 import org.bitrepository.protocol.ProtocolVersionLoader;
 import org.bitrepository.service.contributor.ContributorContext;
 
+import java.math.BigInteger;
+
 /**
  * The interface for the request handlers.
+ *
  * @param <T> The request class for the specific type of requests to be handled by this request handler.
  */
 public abstract class AbstractRequestHandler<T extends MessageRequest> implements RequestHandler<T> {
-    /** The constant for the VERSION of the messages.*/
     protected static final BigInteger VERSION = ProtocolVersionLoader.loadProtocolVersion().getVersion();
-    /** The constant for the MIN_VERSION of the messages.*/
     protected static final BigInteger MIN_VERSION = ProtocolVersionLoader.loadProtocolVersion().getMinVersion();
-    
-    /** The classpath to the 'xsd'.*/
     protected static final String XSD_CLASSPATH = "xsd/";
-    /** The name of the XSD containing the BitRepositoryData elements. */
     protected static final String XSD_BR_DATA = "BitRepositoryData.xsd";
-    
-    /** The context for the contributor.*/
     private final ContributorContext context;
-    
+
     /**
-     * Constructor.
      * @param context The context for this contributor.
      */
     protected AbstractRequestHandler(ContributorContext context) {
@@ -65,7 +58,8 @@ protected ContributorContext getContext() {
 
     /**
      * Delegates to the response dispatchers dispatchResponse method.
-     * @param request the request
+     *
+     * @param request  the request
      * @param response the response
      */
     protected void dispatchResponse(MessageResponse response, T request) {
@@ -74,10 +68,11 @@ protected void dispatchResponse(MessageResponse response, T request) {
 
     /**
      * Validates that the collectionID has been set.
+     *
      * @param request The request to check the collectionID for.
      */
     protected void validateCollectionID(T request) {
-        if(!request.isSetCollectionID()) {
+        if (!request.isSetCollectionID()) {
             throw new IllegalArgumentException(request.getClass().getSimpleName() +
                     "'s requires a CollectionID");
         }
diff --git a/bitrepository-service/src/main/java/org/bitrepository/service/contributor/handler/GetAuditTrailsRequestHandler.java b/bitrepository-service/src/main/java/org/bitrepository/service/contributor/handler/GetAuditTrailsRequestHandler.java
index 51aec3142..1800faa18 100644
--- a/bitrepository-service/src/main/java/org/bitrepository/service/contributor/handler/GetAuditTrailsRequestHandler.java
+++ b/bitrepository-service/src/main/java/org/bitrepository/service/contributor/handler/GetAuditTrailsRequestHandler.java
@@ -5,33 +5,22 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.service.contributor.handler;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.util.Date;
-
-import javax.xml.bind.JAXBException;
-
 import org.apache.activemq.util.ByteArrayInputStream;
 import org.bitrepository.bitrepositorydata.GetAuditTrailsResults;
 import org.bitrepository.bitrepositoryelements.ResponseCode;
@@ -54,18 +43,25 @@
 import org.slf4j.LoggerFactory;
 import org.xml.sax.SAXException;
 
+import javax.xml.bind.JAXBException;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.util.Date;
+
 /**
  * Class for handling the GetAuditTrails operation.
  */
 public class GetAuditTrailsRequestHandler extends AbstractRequestHandler<GetAuditTrailsRequest> {
-    /** The log.*/
-    private Logger log = LoggerFactory.getLogger(getClass());
-    /** The audit trail manager.*/
+    private final Logger log = LoggerFactory.getLogger(getClass());
     private final AuditTrailManager auditManager;
-    
+
     /**
-     * Constructor.
-     * @param context The context of the message handler.
+     * @param context      The context of the message handler.
      * @param auditManager the audit manager
      */
     public GetAuditTrailsRequestHandler(ContributorContext context, AuditTrailManager auditManager) {
@@ -95,24 +91,24 @@ public MessageResponse generateFailedResponse(GetAuditTrailsRequest request) {
 
     /**
      * Method for validating the content of the message.
+     *
      * @param message The message requesting the operation, which should be validated.
      * @throws InvalidMessageException if the message was invalid
      */
     protected void validateMessage(GetAuditTrailsRequest message) throws InvalidMessageException {
-        if(!message.getContributor().equals(getContext().getSettings().getComponentID())) {
-            throw new InvalidMessageException(
-                    ResponseCode.REQUEST_NOT_UNDERSTOOD_FAILURE, 
-                    "Invalid contributor id.");
+        if (!message.getContributor().equals(getContext().getSettings().getComponentID())) {
+            throw new InvalidMessageException(ResponseCode.REQUEST_NOT_UNDERSTOOD_FAILURE, "Invalid contributor id.");
         }
     }
-    
+
     /**
      * The method for sending a progress response telling, that the operation is about to be performed.
+     *
      * @param request The request for the GetStatus operation.
      */
     protected void sendProgressMessage(GetAuditTrailsRequest request) {
         GetAuditTrailsProgressResponse response = createProgressResponse(request);
-        
+
         // set missing variables in the request: ResponseInfo
         ResponseInfo prInfo = new ResponseInfo();
         prInfo.setResponseCode(ResponseCode.OPERATION_ACCEPTED_PROGRESS);
@@ -121,135 +117,132 @@ protected void sendProgressMessage(GetAuditTrailsRequest request) {
 
         getContext().getResponseDispatcher().dispatchResponse(response, request);
     }
-    
+
     /**
      * Collect the requested audit trails.
+     *
      * @param message The message requesting the collecting of audit trails.
      * @return The requested audit trails.
      */
     protected AuditTrailDatabaseResults collectAudits(GetAuditTrailsRequest message) {
         Long minSeq = null;
-        if(message.getMinSequenceNumber() != null) {
+        if (message.getMinSequenceNumber() != null) {
             log.trace("Minimum sequence value: {}", message.getMinSequenceNumber().longValue());
             minSeq = message.getMinSequenceNumber().longValue();
         }
         Long maxSeq = null;
-        if(message.getMaxSequenceNumber() != null) {
+        if (message.getMaxSequenceNumber() != null) {
             log.trace("Maximum sequence value: {}", message.getMaxSequenceNumber().longValue());
             maxSeq = message.getMaxSequenceNumber().longValue();
         }
         Date minDate = null;
-        if(message.getMinTimestamp() != null) {
+        if (message.getMinTimestamp() != null) {
             log.trace("Minimum date value: {}", message.getMinTimestamp());
             minDate = CalendarUtils.convertFromXMLGregorianCalendar(message.getMinTimestamp());
         }
         Date maxDate = null;
-        if(message.getMaxTimestamp() != null) {
+        if (message.getMaxTimestamp() != null) {
             log.trace("Maximum date value: {}", message.getMaxTimestamp());
             maxDate = CalendarUtils.convertFromXMLGregorianCalendar(message.getMaxTimestamp());
         }
         Long maxNumberOfResults = null;
-        if(message.getMaxNumberOfResults() != null) {
+        if (message.getMaxNumberOfResults() != null) {
             log.trace("Maximum number of results: {}", message.getMaxNumberOfResults());
             maxNumberOfResults = message.getMaxNumberOfResults().longValue();
         }
-        
-        return auditManager.getAudits(message.getCollectionID(), message.getFileID(), minSeq, maxSeq, minDate, 
-                maxDate, maxNumberOfResults);
+
+        return auditManager.getAudits(message.getCollectionID(), message.getFileID(), minSeq, maxSeq, minDate, maxDate, maxNumberOfResults);
     }
-    
+
     /**
      * Handles the potential upload of the audit trails to a given URL.
-     * @param message The request for the audit trails, which includes the URL for where the audit trails should be 
-     * uploaded
+     *
+     * @param message              The request for the audit trails, which includes the URL for where the audit trails should be
+     *                             uploaded
      * @param extractedAuditTrails The extracted audit trails.
      * @throws InvalidMessageException If the creation, serialization, validation or upload of the file fails.
      */
-    protected void handleUpload(GetAuditTrailsRequest message, AuditTrailDatabaseResults extractedAuditTrails) throws InvalidMessageException {
-        if(message.getResultAddress() == null || message.getResultAddress().isEmpty()) {
+    protected void handleUpload(GetAuditTrailsRequest message, AuditTrailDatabaseResults extractedAuditTrails)
+            throws InvalidMessageException {
+        if (message.getResultAddress() == null || message.getResultAddress().isEmpty()) {
             log.trace("The audit trails are not uploaded.");
             return;
         }
-        
+
         log.debug("Creating audit trail file and uploading it.");
         try {
             File fileToUpload = createAuditTrailFile(message, extractedAuditTrails);
             URL uploadUrl = new URL(message.getResultAddress());
-            
+
             log.debug("Uploading file: " + fileToUpload.getName() + " to " + uploadUrl.toExternalForm());
             getContext().getFileExchange().putFile(new FileInputStream(fileToUpload), uploadUrl);
         } catch (Exception e) {
-            throw new InvalidMessageException(
-                    ResponseCode.FILE_TRANSFER_FAILURE, 
+            throw new InvalidMessageException(ResponseCode.FILE_TRANSFER_FAILURE,
                     "Could not handle the creation and upload of the results due to: " + e.getMessage(), e);
         }
     }
-    
+
     /**
      * Creates a file containing all the audit trails.
-     * @param request The request for the data.
+     *
+     * @param request              The request for the data.
      * @param extractedAuditTrails The extracted audit trails.
      * @return The file containing the extracted audit trails.
-     * @throws IOException If something goes wrong when creating the file or finding the XSD.
+     * @throws IOException   If something goes wrong when creating the file or finding the XSD.
      * @throws JAXBException If the resulting structure cannot be serialized.
-     * @throws SAXException If the results does not validate against the XSD.
+     * @throws SAXException  If the results does not validate against the XSD.
      */
-    protected File createAuditTrailFile(GetAuditTrailsRequest request, AuditTrailDatabaseResults extractedAuditTrails) 
+    protected File createAuditTrailFile(GetAuditTrailsRequest request, AuditTrailDatabaseResults extractedAuditTrails)
             throws IOException, JAXBException, SAXException {
         File checksumResultFile = File.createTempFile(request.getCorrelationID(), new Date().getTime() + ".at");
-        
+
         GetAuditTrailsResults results = new GetAuditTrailsResults();
         results.setVersion(ProtocolVersionLoader.loadProtocolVersion().getVersion());
         results.setMinVersion(ProtocolVersionLoader.loadProtocolVersion().getMinVersion());
         results.setCollectionID(request.getCollectionID());
         results.getAuditTrailEvents().add(extractedAuditTrails.getAuditTrailEvents());
 
-        OutputStream is = null;
-        try {
-            is = new FileOutputStream(checksumResultFile);
+        try (OutputStream is = new FileOutputStream(checksumResultFile)) {
             JaxbHelper jaxb = new JaxbHelper(XSD_CLASSPATH, XSD_BR_DATA);
             String xmlMessage = jaxb.serializeToXml(results);
             jaxb.validate(new ByteArrayInputStream(xmlMessage.getBytes(StandardCharsets.UTF_8)));
             is.write(xmlMessage.getBytes(StandardCharsets.UTF_8));
             is.flush();
-        } finally {
-            if(is != null) {
-                is.close();
-            }
         }
-        
+
         return checksumResultFile;
     }
 
     /**
      * Method for sending a positive final response.
-     * @param request The request to respond to.
+     *
+     * @param request      The request to respond to.
      * @param auditExtract The retrieved audit trails.
      */
     protected void sendFinalResponse(GetAuditTrailsRequest request, AuditTrailDatabaseResults auditExtract) {
         GetAuditTrailsFinalResponse response = createFinalResponse(request);
         ResultingAuditTrails resAuditTrails = new ResultingAuditTrails();
-        if(request.getResultAddress() == null) {
+        if (request.getResultAddress() == null) {
             resAuditTrails.setAuditTrailEvents(auditExtract.getAuditTrailEvents());
         } else {
             resAuditTrails.setResultAddress(request.getResultAddress());
         }
-        
+
         response.setResultingAuditTrails(resAuditTrails);
         response.setPartialResult(auditExtract.moreResults());
-        
+
         ResponseInfo responseInfo = new ResponseInfo();
         responseInfo.setResponseCode(ResponseCode.OPERATION_COMPLETED);
         response.setResponseInfo(responseInfo);
 
         getContext().getResponseDispatcher().dispatchResponse(response, request);
     }
-    
+
     /**
-     * Creates a GetStatusProgressResponse based on a GetStatusRequest. Missing the 
+     * Creates a GetStatusProgressResponse based on a GetStatusRequest. Missing the
      * following fields (besides the ones in dispatchResponse):
      * <br/> - ResponseInfo
-     * 
+     *
      * @param message The message to base the response upon.
      * @return The GetStatusProgressResponse based on the request.
      */
@@ -257,24 +250,25 @@ private GetAuditTrailsProgressResponse createProgressResponse(GetAuditTrailsRequ
         GetAuditTrailsProgressResponse res = new GetAuditTrailsProgressResponse();
         res.setContributor(getContext().getSettings().getComponentID());
         res.setResultAddress(message.getResultAddress());
-        
+
         return res;
     }
-    
+
     /**
-     * Creates a GetStatusFinalResponse based on a GetStatusRequest. Missing the 
+     * Creates a GetStatusFinalResponse based on a GetStatusRequest. Missing the
      * following fields (besides the ones in dispatchResponse):
      * <ul>
      * <li>ResponseInfo</li>
      * <li>ResultingAuditTrails</li>
      * </ul>
+     *
      * @param request the audit trail request. Ignored
      * @return The GetStatusFinalResponse based on the request.
      */
     protected GetAuditTrailsFinalResponse createFinalResponse(GetAuditTrailsRequest request) {
         GetAuditTrailsFinalResponse res = new GetAuditTrailsFinalResponse();
         res.setContributor(getContext().getSettings().getComponentID());
-        
+
         return res;
     }
 }
diff --git a/bitrepository-service/src/main/java/org/bitrepository/service/contributor/handler/GetStatusRequestHandler.java b/bitrepository-service/src/main/java/org/bitrepository/service/contributor/handler/GetStatusRequestHandler.java
index d65c06b81..5472ae5b1 100644
--- a/bitrepository-service/src/main/java/org/bitrepository/service/contributor/handler/GetStatusRequestHandler.java
+++ b/bitrepository-service/src/main/java/org/bitrepository/service/contributor/handler/GetStatusRequestHandler.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -40,7 +40,6 @@
  */
 public class GetStatusRequestHandler extends AbstractRequestHandler<GetStatusRequest> {
     /**
-     * Constructor.
      * @param context The context for the contributor.
      */
     public GetStatusRequestHandler(ContributorContext context) {
@@ -58,20 +57,21 @@ public void processRequest(GetStatusRequest request, MessageContext messageConte
         responseProgress(request);
         sendFinalSuccess(request);
     }
-    
+
     @Override
     public GetStatusFinalResponse generateFailedResponse(GetStatusRequest request) {
         GetStatusFinalResponse response = createFinalResponse(request);
         response.setResultingStatus(failedStatus());
         return response;
     }
-    
+
     /**
      * Validates the content of the message.
+     *
      * @param request The message to validate.
      */
     private void validateMessage(GetStatusRequest request) {
-        if(!request.getContributor().equals(getContext().getSettings().getComponentID())) {
+        if (!request.getContributor().equals(getContext().getSettings().getComponentID())) {
             throw new IllegalArgumentException("Illegal argument exception. Expected: " + getContext().getSettings().getComponentID()
                     + ", but it was " + request.getContributor());
         }
@@ -79,6 +79,7 @@ private void validateMessage(GetStatusRequest request) {
 
     /**
      * Creates and sends the progress response.
+     *
      * @param request The request to base the response upon.
      */
     private void responseProgress(GetStatusRequest request) {
@@ -87,9 +88,10 @@ private void responseProgress(GetStatusRequest request) {
         response.setContributor(getContext().getSettings().getComponentID());
         getContext().getResponseDispatcher().dispatchResponse(response, request);
     }
-    
+
     /**
      * Creates and sends the final response telling about success.
+     *
      * @param request The request to base the response upon.
      */
     private void sendFinalSuccess(GetStatusRequest request) {
@@ -103,13 +105,13 @@ private void sendFinalSuccess(GetStatusRequest request) {
 
         getContext().getResponseDispatcher().dispatchResponse(response, request);
     }
-    
+
     /**
      * Creates the final response for the status message.
      * Missing:
      * <br/> ResponseInfo
      * <br/> ResultingStatus
-     * 
+     *
      * @param request The request to base the response upon.
      * @return The final response.
      */
@@ -124,27 +126,27 @@ private GetStatusFinalResponse createFinalResponse(GetStatusRequest request) {
      */
     protected ResultingStatus getStatus() {
         ResultingStatus res = new ResultingStatus();
-        
+
         StatusInfo status = new StatusInfo();
         status.setStatusCode(StatusCode.OK);
-        status.setStatusText("Version: " + getClass().getPackage().getImplementationVersion() + 
+        status.setStatusText("Version: " + getClass().getPackage().getImplementationVersion() +
                 " MessageXML version: " + MessageVersionValidator.getProtocolVersion());
-        
+
         res.setStatusInfo(status);
         res.setStatusTimestamp(CalendarUtils.getNow());
         return res;
     }
-    
+
     /**
      * @return Negative status info for the contributor.
      */
     protected ResultingStatus failedStatus() {
         ResultingStatus res = new ResultingStatus();
-        
+
         StatusInfo status = new StatusInfo();
         status.setStatusCode(StatusCode.ERROR);
         status.setStatusText("Unexpected error.");
-        
+
         res.setStatusInfo(status);
         res.setStatusTimestamp(CalendarUtils.getNow());
         return res;
diff --git a/bitrepository-service/src/main/java/org/bitrepository/service/contributor/handler/IdentifyContributorsForGetAuditTrailsRequestHandler.java b/bitrepository-service/src/main/java/org/bitrepository/service/contributor/handler/IdentifyContributorsForGetAuditTrailsRequestHandler.java
index 67c005592..4811fede9 100644
--- a/bitrepository-service/src/main/java/org/bitrepository/service/contributor/handler/IdentifyContributorsForGetAuditTrailsRequestHandler.java
+++ b/bitrepository-service/src/main/java/org/bitrepository/service/contributor/handler/IdentifyContributorsForGetAuditTrailsRequestHandler.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -33,10 +33,9 @@
 /**
  * Class for handling the identification of this pillar for the purpose of performing the GetStatus operation.
  */
-public class IdentifyContributorsForGetAuditTrailsRequestHandler 
+public class IdentifyContributorsForGetAuditTrailsRequestHandler
         extends AbstractRequestHandler<IdentifyContributorsForGetAuditTrailsRequest> {
     /**
-     * Constructor.
      * @param context The context of the message handler.
      */
     public IdentifyContributorsForGetAuditTrailsRequestHandler(ContributorContext context) {
@@ -59,9 +58,10 @@ public void processRequest(IdentifyContributorsForGetAuditTrailsRequest message,
     public MessageResponse generateFailedResponse(IdentifyContributorsForGetAuditTrailsRequest request) {
         return createResponse();
     }
-    
+
     /**
      * Makes a success response for the identification.
+     *
      * @param request The request to base the response upon.
      */
     protected void respondSuccessfulIdentification(IdentifyContributorsForGetAuditTrailsRequest request) {
@@ -69,20 +69,20 @@ protected void respondSuccessfulIdentification(IdentifyContributorsForGetAuditTr
         response.setResponseInfo(ResponseInfoUtils.getPositiveIdentification());
         getContext().getResponseDispatcher().dispatchResponse(response, request);
     }
-    
+
     /**
      * Sends a bad response with the given cause.
-     * @param request The identification request to respond to.
+     *
+     * @param request      The identification request to respond to.
      * @param responseInfo The cause of the bad identification (e.g. which file is missing).
      */
-    protected void respondFailedIdentification(IdentifyContributorsForGetAuditTrailsRequest request,
-            ResponseInfo responseInfo) {
+    protected void respondFailedIdentification(IdentifyContributorsForGetAuditTrailsRequest request, ResponseInfo responseInfo) {
         IdentifyContributorsForGetAuditTrailsResponse response = createResponse();
-        
+
         response.setResponseInfo(responseInfo);
         getContext().getResponseDispatcher().dispatchResponse(response, request);
     }
-    
+
     /**
      * Creates a IdentifyContributorsForGetAuditTrailsResponse based on a
      * IdentifyContributorsForGetAuditTrailsResponse. The following fields are not inserted:
@@ -93,7 +93,6 @@ protected void respondFailedIdentification(IdentifyContributorsForGetAuditTrails
      * @return The response to the request.
      */
     protected IdentifyContributorsForGetAuditTrailsResponse createResponse() {
-        IdentifyContributorsForGetAuditTrailsResponse res = new IdentifyContributorsForGetAuditTrailsResponse();
-        return res;
+        return new IdentifyContributorsForGetAuditTrailsResponse();
     }
 }
diff --git a/bitrepository-service/src/main/java/org/bitrepository/service/contributor/handler/IdentifyContributorsForGetStatusRequestHandler.java b/bitrepository-service/src/main/java/org/bitrepository/service/contributor/handler/IdentifyContributorsForGetStatusRequestHandler.java
index f1fb7bd78..de9f6e87d 100644
--- a/bitrepository-service/src/main/java/org/bitrepository/service/contributor/handler/IdentifyContributorsForGetStatusRequestHandler.java
+++ b/bitrepository-service/src/main/java/org/bitrepository/service/contributor/handler/IdentifyContributorsForGetStatusRequestHandler.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -34,11 +34,10 @@
 /**
  * Handler for the IdentifyContributorsForGetStatusRequest.
  */
-public class IdentifyContributorsForGetStatusRequestHandler 
+public class IdentifyContributorsForGetStatusRequestHandler
         extends AbstractRequestHandler<IdentifyContributorsForGetStatusRequest> {
-    
+
     /**
-     * Constructor.
      * @param context The context for the contributor.
      */
     public IdentifyContributorsForGetStatusRequestHandler(ContributorContext context) {
@@ -60,12 +59,12 @@ public void processRequest(IdentifyContributorsForGetStatusRequest request, Mess
 
     @Override
     public MessageResponse generateFailedResponse(IdentifyContributorsForGetStatusRequest request) {
-        GetStatusFinalResponse response = new GetStatusFinalResponse();
-        return response;
+        return new GetStatusFinalResponse();
     }
 
     /**
      * Creates the default status info for the response.
+     *
      * @return The status info for the response.
      */
     protected StatusInfo getStatus() {
diff --git a/bitrepository-service/src/main/java/org/bitrepository/service/contributor/handler/RequestHandler.java b/bitrepository-service/src/main/java/org/bitrepository/service/contributor/handler/RequestHandler.java
index dec8841a9..3c0681d44 100644
--- a/bitrepository-service/src/main/java/org/bitrepository/service/contributor/handler/RequestHandler.java
+++ b/bitrepository-service/src/main/java/org/bitrepository/service/contributor/handler/RequestHandler.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -28,18 +28,21 @@
 
 /**
  * Provides functionality for handling a single type of request.
+ *
  * @param <T> the type request handled by this handler
  */
 public interface RequestHandler<T extends MessageRequest> {
-    /** Return the request class which is handled by this handler.
+    /**
+     * Return the request class which is handled by this handler.
+     *
      * @return the class of requests handled by this RequestHandler
-     * */
+     */
     Class<T> getRequestClass();
 
     /**
      * Implements the concrete handling of a received request.
      *
-     * @param request The request to handle.
+     * @param request        The request to handle.
      * @param messageContext the message context
      * @throws RequestHandlerException If something goes wrong while handling the
      */
@@ -48,6 +51,7 @@ public interface RequestHandler<T extends MessageRequest> {
     /**
      * Used for creating responses signaling general failures to handle the request.
      * The response is missing the response info field.
+     *
      * @param request the request to create a response for
      * @return The failure response.
      */
diff --git a/bitrepository-service/src/main/java/org/bitrepository/service/database/DBConnector.java b/bitrepository-service/src/main/java/org/bitrepository/service/database/DBConnector.java
index f65c121e1..7ce64f31c 100644
--- a/bitrepository-service/src/main/java/org/bitrepository/service/database/DBConnector.java
+++ b/bitrepository-service/src/main/java/org/bitrepository/service/database/DBConnector.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -23,27 +23,26 @@
 
 import com.mchange.v2.c3p0.ComboPooledDataSource;
 import com.mchange.v2.c3p0.DataSources;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.util.Properties;
 import org.bitrepository.common.ArgumentValidator;
 import org.bitrepository.settings.referencesettings.DatabaseSpecifics;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.Properties;
+
 /**
  * The connector to a database.
  */
 public class DBConnector {
-    /** The log.*/
-    private Logger log = LoggerFactory.getLogger(getClass());
-    /** The specifications for connection to the database.*/
+    private final Logger log = LoggerFactory.getLogger(getClass());
     private final DatabaseSpecifics databaseSpecifics;
-    /** The pool with data sources for the database connections.*/
-    private ComboPooledDataSource connectionPool;
-    
+    private final ComboPooledDataSource connectionPool;
+
     /**
      * Constructor.
+     *
      * @param databaseSpecifics The specifics for the configuration of the database.
      */
     public DBConnector(DatabaseSpecifics databaseSpecifics) {
@@ -54,14 +53,14 @@ public DBConnector(DatabaseSpecifics databaseSpecifics) {
         this.connectionPool = new ComboPooledDataSource();
         initialiseConnectionPool();
     }
-    
+
     /**
      * @return The class for the driver for the database.
      */
     public String getDatabaseDriverClass() {
         return databaseSpecifics.getDriverClass();
     }
-    
+
     /**
      * Initialises the ConnectionPool for the connections to the database.
      */
@@ -70,14 +69,15 @@ private void initialiseConnectionPool() {
             log.info("Creating the connection to the database '" + DatabaseUtils.getDatabaseSpecificsDump(databaseSpecifics) + "'.");
             connectionPool.setDriverClass(databaseSpecifics.getDriverClass());
             connectionPool.setJdbcUrl(databaseSpecifics.getDatabaseURL());
-            if(databaseSpecifics.isSetUsername()) {
+            if (databaseSpecifics.isSetUsername()) {
                 connectionPool.setUser(databaseSpecifics.getUsername());
             }
-            if(databaseSpecifics.isSetPassword()) {
+            if (databaseSpecifics.isSetPassword()) {
                 connectionPool.setPassword(databaseSpecifics.getPassword());
             }
         } catch (Exception e) {
-            throw new IllegalStateException("Could not connect to the database '" +  DatabaseUtils.getDatabaseSpecificsDump(databaseSpecifics) + "'", e);
+            throw new IllegalStateException(
+                    "Could not connect to the database '" + DatabaseUtils.getDatabaseSpecificsDump(databaseSpecifics) + "'", e);
         }
     }
 
@@ -90,9 +90,10 @@ private void silenceC3P0Logger() {
         p.put("com.mchange.v2.log.FallbackMLog.DEFAULT_CUTOFF_LEVEL", "OFF"); // or any other
         System.setProperties(p);
     }
-    
+
     /**
      * Creates and connects to the database.
+     *
      * @return The connection to the database.
      * @throws IllegalStateException if the database connection could not be established
      */
@@ -100,11 +101,12 @@ public Connection getConnection() throws IllegalStateException {
         try {
             return connectionPool.getConnection();
         } catch (SQLException e) {
-            throw new IllegalStateException("Could not establish connection to the database: '" +  DatabaseUtils.getDatabaseSpecificsDump(databaseSpecifics) 
-                    + "'", e);
+            throw new IllegalStateException(
+                    "Could not establish connection to the database: '" + DatabaseUtils.getDatabaseSpecificsDump(databaseSpecifics)
+                            + "'", e);
         }
     }
-    
+
     /**
      * Cleans up after use.
      */
diff --git a/bitrepository-service/src/main/java/org/bitrepository/service/database/DatabaseCreator.java b/bitrepository-service/src/main/java/org/bitrepository/service/database/DatabaseCreator.java
index 94d8101a2..4a8911bf1 100644
--- a/bitrepository-service/src/main/java/org/bitrepository/service/database/DatabaseCreator.java
+++ b/bitrepository-service/src/main/java/org/bitrepository/service/database/DatabaseCreator.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -38,14 +38,14 @@ public class DatabaseCreator extends DatabaseMaintainer {
 
     /**
      * Creates a database by running the supplied script.
-     * @param scriptName The name of the script including path as part of the
-     * classpath.
-     * @param databaseSpecifics Specifies where to create the database.
      *
+     * @param scriptName        The name of the script including path as part of the
+     *                          classpath.
+     * @param databaseSpecifics Specifies where to create the database.
      */
     protected void createDatabase(DatabaseSpecifics databaseSpecifics, String scriptName) {
         DatabaseSpecifics databaseCreationSpecifics = updateDatabaseSpecificsForDBCreation(databaseSpecifics);
-        log.info("Creating database in " +  DatabaseUtils.getDatabaseSpecificsDump(databaseCreationSpecifics) 
+        log.info("Creating database in " + DatabaseUtils.getDatabaseSpecificsDump(databaseCreationSpecifics)
                 + " from script " + scriptName);
         try {
             runScript(databaseCreationSpecifics, scriptName);
@@ -71,7 +71,7 @@ private static DatabaseSpecifics updateDatabaseSpecificsForDBCreation(DatabaseSp
 
     protected Settings loadSettings(String pillarID, String pathToSettings) {
         SettingsProvider settingsLoader =
-            new SettingsProvider(new XMLFileSettingsLoader(pathToSettings), pillarID);
+                new SettingsProvider(new XMLFileSettingsLoader(pathToSettings), pillarID);
 
         return settingsLoader.getSettings();
     }
diff --git a/bitrepository-service/src/main/java/org/bitrepository/service/database/DatabaseFactory.java b/bitrepository-service/src/main/java/org/bitrepository/service/database/DatabaseFactory.java
index 425417517..5211eee16 100644
--- a/bitrepository-service/src/main/java/org/bitrepository/service/database/DatabaseFactory.java
+++ b/bitrepository-service/src/main/java/org/bitrepository/service/database/DatabaseFactory.java
@@ -8,12 +8,12 @@
  * it under the terms of the GNU Lesser General Public License as
  * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
@@ -25,6 +25,7 @@
 
 /**
  * DatabaseFactory which knows - based on the driver class - whether to use a Derby or Postgres backend.
+ *
  * @param <T> class
  */
 // FIXME:  Is tasting on the name of the driver class the right way to detect the database type?
@@ -32,32 +33,33 @@
 public abstract class DatabaseFactory<T> {
 
     public static final String derbyDriver = "org.apache.derby.jdbc.EmbeddedDriver";
-    public static final String postgressDriver = "org.postgresql.Driver";
-    
+    public static final String postgresDriver = "org.postgresql.Driver";
+
     /**
      * Obtain the appropriate DAO instance for the concrete backend.
+     *
      * @param ds the database specifics
      * @return the appropriate DAO instance for the concrete backend.
      * @throws UnsupportedDatabaseTypeException if the driver is not either derby or postgres
      * @see #derbyDriver
-     * @see #postgressDriver
+     * @see #postgresDriver
      */
-    protected T getDAOInstance(DatabaseSpecifics ds) throws UnsupportedDatabaseTypeException{
+    protected T getDAOInstance(DatabaseSpecifics ds) throws UnsupportedDatabaseTypeException {
         DatabaseManager dm = getDatabaseManager(ds);
         String dbDriver = ds.getDriverClass();
-        if(dbDriver.equals(derbyDriver)) {
+        if (dbDriver.equals(derbyDriver)) {
             return getDerbyDAO(dm);
-        } else if(dbDriver.equals(postgressDriver)) {
+        } else if (dbDriver.equals(postgresDriver)) {
             return getPostgresDAO(dm);
         } else {
             throw new UnsupportedDatabaseTypeException("The database for driver: '" + dbDriver
-                    + "' is not supported, use '" + derbyDriver + "' or '" + postgressDriver + "'");
+                    + "' is not supported, use '" + derbyDriver + "' or '" + postgresDriver + "'");
         }
     }
-    
+
     protected abstract T getDerbyDAO(DatabaseManager dm);
-    
+
     protected abstract T getPostgresDAO(DatabaseManager dm);
-    
+
     protected abstract DatabaseManager getDatabaseManager(DatabaseSpecifics ds);
 }
diff --git a/bitrepository-service/src/main/java/org/bitrepository/service/database/DatabaseMaintainer.java b/bitrepository-service/src/main/java/org/bitrepository/service/database/DatabaseMaintainer.java
index c92b6c8a7..019381bd1 100644
--- a/bitrepository-service/src/main/java/org/bitrepository/service/database/DatabaseMaintainer.java
+++ b/bitrepository-service/src/main/java/org/bitrepository/service/database/DatabaseMaintainer.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -42,13 +42,14 @@ public class DatabaseMaintainer {
 
     /**
      * Attempts to find a script with the indicated name in the classpath and run it.
+     *
      * @param databaseSpecifics the specifics of the database
-     * @param scriptName The name of the script in the classpath.
-     * @throws SQLException if a connection to the database could not be established or if it failed to close the connection
+     * @param scriptName        The name of the script in the classpath.
+     * @throws SQLException           if a connection to the database could not be established or if it failed to close the connection
      * @throws ClassNotFoundException if the database driver is not on the classpath
-     * @throws IOException if the script can not be read
-     * @throws FileNotFoundException if the script is not on the classpath
-     * @throws RuntimeException if the script can not be run
+     * @throws IOException            if the script can not be read
+     * @throws FileNotFoundException  if the script is not on the classpath
+     * @throws RuntimeException       if the script can not be run
      */
     protected static void runScript(DatabaseSpecifics databaseSpecifics, String scriptName) throws SQLException,
             ClassNotFoundException, FileNotFoundException, IOException {
@@ -56,15 +57,16 @@ protected static void runScript(DatabaseSpecifics databaseSpecifics, String scri
         runScript(connection, scriptName);
         connection.close();
     }
-    
+
     /**
      * Attempts to find a script with the indicated name in the classpath and run it.
-     * @param connector the database connector
+     *
+     * @param connector  the database connector
      * @param scriptName The name of the script in the classpath.
-     * @throws IOException if the script could not be read or found
+     * @throws IOException           if the script could not be read or found
      * @throws IllegalStateException if the database connection could not be opened
-     * @throws SQLException if the database connection could not be closed
-     * @throws RuntimeException if the script failed
+     * @throws SQLException          if the database connection could not be closed
+     * @throws RuntimeException      if the script failed
      * @see #runScript(Connection, String)
      */
     protected static void runScript(DBConnector connector, String scriptName) throws IOException, IllegalStateException,
@@ -73,13 +75,13 @@ protected static void runScript(DBConnector connector, String scriptName) throws
         runScript(connection, scriptName);
         connection.close();
     }
-    
+
     /**
-     *
      * Run the script given.
+     *
      * @param connection the database connection
      * @param scriptName the name of the script
-     * @throws IOException if the script could not be read
+     * @throws IOException      if the script could not be read
      * @throws RuntimeException if the script could not be run
      * @see SqlScriptRunner#runScript(Reader)
      */
@@ -90,12 +92,13 @@ private static void runScript(Connection connection, String scriptName) throws I
 
     /**
      * Creates a reader for the file found at indicated location.
+     *
      * @param filePath the path to the file on the classpath
      * @return a reader for the content
-     * @throws IOException if the file cannot be read
+     * @throws IOException           if the file cannot be read
      * @throws FileNotFoundException if the file is not on the classpath
      */
-    private static Reader getReaderForFile(String filePath) throws  FileNotFoundException, java.io.IOException {
+    private static Reader getReaderForFile(String filePath) throws FileNotFoundException, java.io.IOException {
         InputStream is = DatabaseMaintainer.class.getClassLoader().getResourceAsStream(filePath);
 
         if (is == null) {
@@ -107,10 +110,11 @@ private static Reader getReaderForFile(String filePath) throws  FileNotFoundExce
 
     /**
      * Creates a connection based on the supplied <code>databaseSpecifics</code>.
+     *
      * @param databaseSpecifics the database specifics
-     * @throws SQLException if a connection to the database could not be established
-     * @throws ClassNotFoundException if the specified database driver class could not be found on the classpath
      * @return the connection to the database
+     * @throws SQLException           if a connection to the database could not be established
+     * @throws ClassNotFoundException if the specified database driver class could not be found on the classpath
      */
     protected static Connection getDBConnection(DatabaseSpecifics databaseSpecifics) throws SQLException, ClassNotFoundException {
         Class.forName(databaseSpecifics.getDriverClass());
diff --git a/bitrepository-service/src/main/java/org/bitrepository/service/database/DatabaseManager.java b/bitrepository-service/src/main/java/org/bitrepository/service/database/DatabaseManager.java
index 3f4575240..898778473 100644
--- a/bitrepository-service/src/main/java/org/bitrepository/service/database/DatabaseManager.java
+++ b/bitrepository-service/src/main/java/org/bitrepository/service/database/DatabaseManager.java
@@ -8,12 +8,12 @@
  * it under the terms of the GNU Lesser General Public License as
  * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
@@ -29,89 +29,92 @@
 import java.sql.SQLException;
 
 /**
- * General class for obtaining a database connection to a service's database. 
+ * General class for obtaining a database connection to a service's database.
  * The manager is responsible for:
  * - Creating a new database, if none existed on the connection url (derby only).
  * - Connecting to the database.
  * - Migrating the database schema if needed (derby only).
- * 
- * If the database is unavailable exceptions will be thrown detailing the reason. 
- * Databases that are not automatically migrated will result in an exception. 
+ * <p>
+ * If the database is unavailable exceptions will be thrown detailing the reason.
+ * Databases that are not automatically migrated will result in an exception.
  */
 public abstract class DatabaseManager {
-    private Logger log = LoggerFactory.getLogger(getClass());
+    private final Logger log = LoggerFactory.getLogger(getClass());
     private static final String derbyDriver = "org.apache.derby.jdbc.EmbeddedDriver";
-    private static final String postgressDriver = "org.postgresql.Driver";
+    private static final String postgresDriver = "org.postgresql.Driver";
     protected DBConnector connector = null;
-    
+
     /**
-     * Method to obtain the DBConnector for the concrete instance of the database. 
-     * When a connection is returned, the database is ensured to be existing, connected 
+     * Method to obtain the DBConnector for the concrete instance of the database.
+     * When a connection is returned, the database is ensured to be existing, connected
      * and in the expected version.
+     *
      * @return {@link DBConnector} DBConnector to the database.
      */
     public DBConnector getConnector() {
         DatabaseSpecifics ds = getDatabaseSpecifics();
-        if(ds.getDriverClass().equals(derbyDriver)) {
-            return getDerbyConnection();    
-        } else if(ds.getDriverClass().equals(postgressDriver)) {
+        if (ds.getDriverClass().equals(derbyDriver)) {
+            return getDerbyConnection();
+        } else if (ds.getDriverClass().equals(postgresDriver)) {
             return getPostgresConnection();
         } else {
             throw new IllegalStateException("The database driver: '" + ds.getDriverClass() + "' is not supported."
-                    + " Supported drivers are: '" + derbyDriver + "' and '" + postgressDriver + "'.");
+                    + " Supported drivers are: '" + derbyDriver + "' and '" + postgresDriver + "'.");
         }
-        
-        
+
+
     }
-    
+
     /**
-     * Get a connection to a postgres database 
-     * This method won't attempt to create a database if connection is unsuccessful, 
+     * Get a connection to a postgres database
+     * This method won't attempt to create a database if connection is unsuccessful,
      * also i won't attempt to migrate the database.
+     *
      * @return {@link DBConnector} The connector to the database
      */
     private DBConnector getPostgresConnection() {
-        if(connector == null) {
+        if (connector == null) {
             obtainConnection();
         }
-        if(needsMigration()) {
-            throw new IllegalStateException("Automatic migration of postgres databases are not supported. "+ 
-                    "The database on: " + getDatabaseSpecifics().getDatabaseURL() +  
+        if (needsMigration()) {
+            throw new IllegalStateException("Automatic migration of postgres databases are not supported. " +
+                    "The database on: " + getDatabaseSpecifics().getDatabaseURL() +
                     " needs manuel migration.");
         }
-        
+
         return connector;
     }
-    
+
     /**
-     * Get a connection to a derby database 
+     * Get a connection to a derby database
      * Creates the database if the connection to it fails. Migrates the database schema if it is needed.
-     * @return {@link DBConnector} The connector to the database 
+     *
+     * @return {@link DBConnector} The connector to the database
      */
     private DBConnector getDerbyConnection() {
-        if(connector == null) {
+        if (connector == null) {
             try {
                 obtainConnection();
             } catch (IllegalStateException e) {
-                if(allowAutoCreate()) {
+                if (allowAutoCreate()) {
                     log.warn("Failed to connect to database, attempting to create it");
                     createDatabase();
                 } else {
-                    log.error("Failed to connect to database, autocreation is disabled");
+                    log.error("Failed to connect to database, auto-creation is disabled");
                     throw e;
                 }
             }
-            if(connector == null) {
+            if (connector == null) {
                 obtainConnection();
             }
             log.info("Checking if the database needs to be migrated.");
-            if(needsMigration()) {
-                if(allowAutoMigrate()) {
-                    log.warn("Database needs to be migrated, attempting to automigrate.");
+            if (needsMigration()) {
+                if (allowAutoMigrate()) {
+                    log.warn("Database needs to be migrated, attempting to auto-migrate.");
                     migrateDatabase();
                 } else {
-                    log.error("Database needs migration, automigrations is disabled.");
-                    throw new IllegalStateException("Database needs migration, automigrations is disabled.");
+                    log.error("Database needs migration, auto-migrations is disabled.");
+                    throw new IllegalStateException("Database needs migration, auto-migrations is disabled.");
                 }
             } else {
                 log.info("Database migration was not needed.");
@@ -119,83 +122,89 @@ private DBConnector getDerbyConnection() {
         }
         return connector;
     }
-    
+
     /**
-     * Obtain the database specifics for the database to manage. 
-     * @return DatabaseSpecifics The database specifics for the concrete database 
+     * Obtain the database specifics for the database to manage.
+     *
+     * @return DatabaseSpecifics The database specifics for the concrete database
      */
     protected abstract DatabaseSpecifics getDatabaseSpecifics();
-    
+
     /**
      * Get the migrator for the concrete database.
-     * @return DatabaseMigrator The concrete database migrator 
+     *
+     * @return DatabaseMigrator The concrete database migrator
      */
     protected abstract DatabaseMigrator getMigrator();
-    
+
     /**
-     * Method to determine whether the database needs to be migrated. 
-     * @return true if migration should be done, false otherwise 
+     * Method to determine whether the database needs to be migrated.
+     *
+     * @return true if migration should be done, false otherwise
      */
     protected abstract boolean needsMigration();
-    
+
     /**
-     * Get the path to the file containing the full database schema for initial creation of 
-     * the concrete database. 
-     * @return String The path to the file with the database in String form.  
+     * Get the path to the file containing the full database schema for initial creation of
+     * the concrete database.
+     *
+     * @return String The path to the file with the database in String form.
      */
     protected abstract String getDatabaseCreationScript();
-    
+
     /**
-     * Connect to a database using the database specifics from the implementing class. 
+     * Connect to a database using the database specifics from the implementing class.
+     *
      * @throws IllegalStateException if connection cannot be obtained.
      */
     protected void obtainConnection() throws IllegalStateException {
         log.debug("Obtaining db connection.");
-        connector = new DBConnector(getDatabaseSpecifics()); 
+        connector = new DBConnector(getDatabaseSpecifics());
         Connection connection = connector.getConnection();
         try {
             connection.close();
         } catch (SQLException e) {
-            log.warn("Connection opened for testing connectivaty failed to close", e);
+            log.warn("Connection opened for testing connectivity failed to close", e);
         }
         log.debug("Obtained db connection.");
     }
-    
+
     /**
      * Perform the actual migration of the concrete database.
      */
     private void migrateDatabase() {
         DatabaseMigrator migrator = getMigrator();
-        if(migrator != null) {
+        if (migrator != null) {
             migrator.migrate();
         } else {
             throw new IllegalStateException("The database was attempted migrated, but no migrator was available.");
         }
     }
-    
+
     private boolean allowAutoMigrate() {
         DatabaseSpecifics ds = getDatabaseSpecifics();
-        if(ds.isSetAllowAutoMigrate()) {
+        if (ds.isSetAllowAutoMigrate()) {
             return ds.isAllowAutoMigrate();
         } else {
             return true;
         }
     }
-    
+
     private boolean allowAutoCreate() {
         DatabaseSpecifics ds = getDatabaseSpecifics();
-        if(ds.isSetAllowAutoCreate()) {
+        if (ds.isSetAllowAutoCreate()) {
             return ds.isAllowAutoCreate();
         } else {
             return true;
-        }    }
-    
+        }
+    }
+
     /**
-     * Create the database on the given database specifics.  
+     * Create the database on the given database specifics.
      */
     private void createDatabase() {
         DatabaseCreator databaseCreator = new DatabaseCreator();
         databaseCreator.createDatabase(getDatabaseSpecifics(), getDatabaseCreationScript());
     }
-    
+
 }
diff --git a/bitrepository-service/src/main/java/org/bitrepository/service/database/DatabaseMigrator.java b/bitrepository-service/src/main/java/org/bitrepository/service/database/DatabaseMigrator.java
index 91f65a049..d1a68e13a 100644
--- a/bitrepository-service/src/main/java/org/bitrepository/service/database/DatabaseMigrator.java
+++ b/bitrepository-service/src/main/java/org/bitrepository/service/database/DatabaseMigrator.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2013 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -31,85 +31,82 @@
 /**
  * Abstract class for migrating the databases.
  * Handles the default operations.
- * 
+ * <p>
  * It is asserted, that the database has the following table for the versions:
- *  
+ * <p>
  * create table tableversions (
- *   tablename varchar(100) not null, -- Name of table
- *   version int not null             -- version of table
+ * tablename varchar(100) not null, -- Name of table
+ * version int not null             -- version of table
  * );
  */
 public abstract class DatabaseMigrator extends DatabaseMaintainer {
-    /** The connection to the database.*/
     protected final DBConnector connector;
-    
-    /** The name of the "table versions" table.*/
-    protected static final String TABLEVERSIONS_TABLE = "tableversions";
-    /** The 'tablename' coloumn in the table.*/
-    protected static final String TV_TABLENAME = "tablename";
-    /** The 'version' coloumn in the table.*/
+    protected static final String TABLE_VERSIONS_TABLE = "tableversions";
+    protected static final String TV_TABLE_NAME = "tablename";
     protected static final String TV_VERSION = "version";
-    
+
     /**
-     * Constructor.
      * @param connector The connector for the database.
      */
     protected DatabaseMigrator(DBConnector connector) {
         this.connector = connector;
     }
-    
+
     /**
      * Extracts the version numbers for the tables in the database.
+     *
      * @return The mapping between the table names and their respective version number.
      */
     protected Map<String, Integer> getTableVersions() {
         Map<String, Integer> resultMap = new HashMap<>();
-        
-        // Extract the table name as first coloumn and version as second coloumn. 
-        String sql = "SELECT " + TV_TABLENAME + " , " + TV_VERSION + " FROM " + TABLEVERSIONS_TABLE;
-        int tablenameColoumn = 1;
-        int versionColoumn = 2;
-        
+
+        // Extract the table name as first column and version as second column.
+        String sql = "SELECT " + TV_TABLE_NAME + " , " + TV_VERSION + " FROM " + TABLE_VERSIONS_TABLE;
+        int tableNameColumn = 1;
+        int versionColumn = 2;
+
         try (Connection conn = connector.getConnection();
-             PreparedStatement ps = DatabaseUtils.createPreparedStatement(conn, sql, new Object[0])) {
-            try (ResultSet res = ps.executeQuery()){
+             PreparedStatement ps = DatabaseUtils.createPreparedStatement(conn, sql)) {
+            try (ResultSet res = ps.executeQuery()) {
                 while (res.next()) {
-                    resultMap.put(res.getString(tablenameColoumn), res.getInt(versionColoumn));
+                    resultMap.put(res.getString(tableNameColumn), res.getInt(versionColumn));
                 }
             }
         } catch (SQLException e) {
             throw new IllegalStateException("Cannot extract the table versions.", e);
         }
-        
+
         return resultMap;
     }
-    
+
     /**
      * Performs the update of a single table.
-     * @param tablename The name of the table to update.
+     *
+     * @param tableName  The name of the table to update.
      * @param newVersion The new version for the table.
-     * @param updateSql The SQL for updating the table.
-     * @param args The arguments for performing this update.
+     * @param updateSql  The SQL for updating the table.
+     * @param args       The arguments for performing this update.
      */
-    protected void updateTable(String tablename, Integer newVersion, String updateSql, Object ... args) {
-        String migrateSql = "UPDATE " + TABLEVERSIONS_TABLE + " SET " + TV_VERSION + " = ? WHERE " + TV_TABLENAME 
+    protected void updateTable(String tableName, Integer newVersion, String updateSql, Object... args) {
+        String migrateSql = "UPDATE " + TABLE_VERSIONS_TABLE + " SET " + TV_VERSION + " = ? WHERE " + TV_TABLE_NAME
                 + " = ?";
-        
+
         DatabaseUtils.executeStatement(connector, updateSql, args);
-        DatabaseUtils.executeStatement(connector, migrateSql, newVersion, tablename);
+        DatabaseUtils.executeStatement(connector, migrateSql, newVersion, tableName);
     }
-    
+
     /**
      * Method for running a specific migrate script on the embedded database.
      * Will throw an exception if the migration is tried to be performed on another type of database.
-     * @param migrateScriptName The name of the migrate script to run.
+     *
+     * @param migrateScriptName The name of the migrated script to run.
      */
     protected void migrateDerbyDatabase(String migrateScriptName) {
-        if(connector.getDatabaseDriverClass().equals(DatabaseUtils.DERBY_EMBEDDED_DRIVER)) {
+        if (connector.getDatabaseDriverClass().equals(DatabaseUtils.DERBY_EMBEDDED_DRIVER)) {
             try {
                 runScript(connector, migrateScriptName);
             } catch (Exception e) {
-                throw new IllegalStateException("Cannot migrate the database with the script '" + migrateScriptName 
+                throw new IllegalStateException("Cannot migrate the database with the script '" + migrateScriptName
                         + "'. It is very possible that the database has to be migrated by manually running "
                         + "migrate-scripts.", e);
             }
@@ -119,16 +116,17 @@ protected void migrateDerbyDatabase(String migrateScriptName) {
                     + connector.getDatabaseDriverClass());
         }
     }
-    
+
     /**
      * Perform the migration for the given database.
      */
     abstract public void migrate();
-    
+
     /**
      * Method to determine if migration is needed.
-     * @return true if migration is needed, false otherwise. 
+     *
+     * @return true if migration is needed, false otherwise.
      */
     public abstract boolean needsMigration();
-    
+
 }
diff --git a/bitrepository-service/src/main/java/org/bitrepository/service/database/DatabaseUtils.java b/bitrepository-service/src/main/java/org/bitrepository/service/database/DatabaseUtils.java
index 7e99f7920..7e68b7161 100644
--- a/bitrepository-service/src/main/java/org/bitrepository/service/database/DatabaseUtils.java
+++ b/bitrepository-service/src/main/java/org/bitrepository/service/database/DatabaseUtils.java
@@ -1,23 +1,23 @@
 /*
  * #%L
  * Bitrepository Integrity Client
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -43,31 +43,37 @@
  * Utility class for operating on databases.
  */
 public class DatabaseUtils {
-    /** The log.*/
+    /**
+     * The log.
+     */
     private static final Logger log = LoggerFactory.getLogger(DatabaseUtils.class);
 
-    /** The name of the embedded derby driver.*/
+    /**
+     * The name of the embedded derby driver.
+     */
     public static final String DERBY_EMBEDDED_DRIVER = "org.apache.derby.jdbc.EmbeddedDriver";
-    
-    /** Private constructor to prevent instantiation of this utility class.*/
-    private DatabaseUtils() { }
-    
+
+    /**
+     * Private constructor to prevent instantiation of this utility class.
+     */
+    private DatabaseUtils() {}
+
     /**
-     * Retrieves an integer value from the database through the use of a SQL query, which requests 
+     * Retrieves an integer value from the database through the use of a SQL query, which requests
      * the wanted integer value, and the arguments for the query to become a proper SQL statement.
-     * 
+     *
      * @param dbConnector For connecting to the database.
-     * @param query The query for retrieving the integer value.
-     * @param args The arguments for the database statement.
+     * @param query       The query for retrieving the integer value.
+     * @param args        The arguments for the database statement.
      * @return The integer value from the given statement.
      * @throws IllegalStateException if the connection could not be established,
-     * if the prepared statement could not be created, or the execution failed
+     *                               if the prepared statement could not be created, or the execution failed
      */
     public static Integer selectIntValue(DBConnector dbConnector, String query, Object... args) {
         ArgumentValidator.checkNotNull(dbConnector, "DBConnector dbConnector");
         ArgumentValidator.checkNotNullOrEmpty(query, "String query");
         ArgumentValidator.checkNotNull(args, "Object... args");
-        
+
         try (Connection conn = dbConnector.getConnection();
              PreparedStatement ps = createPreparedStatement(conn, query, args)) {
             try (ResultSet res = ps.executeQuery()) {
@@ -87,23 +93,23 @@ public static Integer selectIntValue(DBConnector dbConnector, String query, Obje
             throw failedExecutionOfStatement(e, query, args);
         }
     }
-    
+
     /**
-     * Retrieves a long value from the database through the use of a SQL query, which requests 
+     * Retrieves a long value from the database through the use of a SQL query, which requests
      * the wanted long value, and the arguments for the query to become a proper SQL statement.
-     * 
+     *
      * @param dbConnector For connecting to the database.
-     * @param query The query for retrieving the long value.
-     * @param args The arguments for the database statement.
+     * @param query       The query for retrieving the long value.
+     * @param args        The arguments for the database statement.
      * @return The long value from the given statement.
      * @throws IllegalStateException if the connection could not be established,
-     * if the prepared statement could not be created, or the execution failed
+     *                               if the prepared statement could not be created, or the execution failed
      */
     public static Long selectLongValue(DBConnector dbConnector, String query, Object... args) {
         ArgumentValidator.checkNotNull(dbConnector, "DBConnector dbConnector");
         ArgumentValidator.checkNotNullOrEmpty(query, "String query");
         ArgumentValidator.checkNotNull(args, "Object... args");
-        
+
         try (Connection conn = dbConnector.getConnection();
              PreparedStatement ps = createPreparedStatement(conn, query, args)) {
             try (ResultSet res = ps.executeQuery()) {
@@ -120,29 +126,29 @@ public static Long selectLongValue(DBConnector dbConnector, String query, Object
                     throw new IllegalStateException("Too many results from " + ps);
                 }
                 return resultLong;
-            } 
+            }
         } catch (SQLException e) {
             throw failedExecutionOfStatement(e, query, args);
         }
     }
-    
+
     /**
-     * Retrieves the first long value from the database through the use of a SQL query and the arguments for the query 
-     * to become a proper SQL statement, which requests the wanted set of long values, where only the first is 
+     * Retrieves the first long value from the database through the use of a SQL query and the arguments for the query
+     * to become a proper SQL statement, which requests the wanted set of long values, where only the first is
      * returned.
-     * 
+     *
      * @param dbConnector For connecting to the database.
-     * @param query The query for retrieving the long value.
-     * @param args The arguments for the database statement.
+     * @param query       The query for retrieving the long value.
+     * @param args        The arguments for the database statement.
      * @return The long value from the given statement.
      * @throws IllegalStateException if the connection could not be established,
-     * if the prepared statement could not be created, or the execution failed
+     *                               if the prepared statement could not be created, or the execution failed
      */
     public static Long selectFirstLongValue(DBConnector dbConnector, String query, Object... args) {
         ArgumentValidator.checkNotNull(dbConnector, "DBConnector dbConnector");
         ArgumentValidator.checkNotNullOrEmpty(query, "String query");
         ArgumentValidator.checkNotNull(args, "Object... args");
-        
+
         try (Connection conn = dbConnector.getConnection();
              PreparedStatement ps = createPreparedStatement(conn, query, args)) {
             try (ResultSet res = ps.executeQuery()) {
@@ -161,24 +167,24 @@ public static Long selectFirstLongValue(DBConnector dbConnector, String query, O
             throw failedExecutionOfStatement(e, query, args);
         }
     }
-    
+
     /**
-     * Retrieves the first string value from the database through the use of a SQL query and the arguments for the query 
-     * to become a proper SQL statement, which requests the wanted set of string values, where only the first is 
+     * Retrieves the first string value from the database through the use of a SQL query and the arguments for the query
+     * to become a proper SQL statement, which requests the wanted set of string values, where only the first is
      * returned.
-     * 
+     *
      * @param dbConnector For connecting to the database.
-     * @param query The query for retrieving the long value.
-     * @param args The arguments for the database statement.
+     * @param query       The query for retrieving the long value.
+     * @param args        The arguments for the database statement.
      * @return The string value from the given statement.
      * @throws IllegalStateException if the connection could not be established,
-     * if the prepared statement could not be created, or the execution failed
+     *                               if the prepared statement could not be created, or the execution failed
      */
     public static String selectFirstStringValue(DBConnector dbConnector, String query, Object... args) {
         ArgumentValidator.checkNotNull(dbConnector, "DBConnector dbConnector");
         ArgumentValidator.checkNotNullOrEmpty(query, "String query");
         ArgumentValidator.checkNotNull(args, "Object... args");
-        
+
         try (Connection conn = dbConnector.getConnection();
              PreparedStatement ps = createPreparedStatement(conn, query, args)) {
             try (ResultSet res = ps.executeQuery()) {
@@ -197,27 +203,28 @@ public static String selectFirstStringValue(DBConnector dbConnector, String quer
             throw failedExecutionOfStatement(e, query, args);
         }
     }
+
     /**
-     * Retrieves a list of long values from the database through the use of a SQL query, which requests 
+     * Retrieves a list of long values from the database through the use of a SQL query, which requests
      * the wanted long values, and the arguments for the query to become a proper SQL statement.
-     * 
+     *
      * @param dbConnector For connecting to the database.
-     * @param query The query for retrieving the long value.
-     * @param args The arguments for the database statement.
+     * @param query       The query for retrieving the long value.
+     * @param args        The arguments for the database statement.
      * @return The list of long values from the given statement.
      * @throws IllegalStateException if the connection could not be established,
-     * if the prepared statement could not be created, or the execution failed
+     *                               if the prepared statement could not be created, or the execution failed
      */
     public static List<Long> selectLongList(DBConnector dbConnector, String query, Object... args) {
         ArgumentValidator.checkNotNull(dbConnector, "DBConnector dbConnector");
         ArgumentValidator.checkNotNullOrEmpty(query, "String query");
         ArgumentValidator.checkNotNull(args, "Object... args");
-        
+
         try (Connection conn = dbConnector.getConnection();
-            PreparedStatement ps = createPreparedStatement(conn, query, args)) {
+             PreparedStatement ps = createPreparedStatement(conn, query, args)) {
             List<Long> list = new ArrayList<>();
             try (ResultSet res = ps.executeQuery()) {
-                while(res.next()) {
+                while (res.next()) {
                     list.add(res.getLong(1));
                 }
                 return list;
@@ -228,51 +235,52 @@ public static List<Long> selectLongList(DBConnector dbConnector, String query, O
     }
 
     /**
-     * Retrieves an date value from the database through the use of a SQL query, which requests 
+     * Retrieves an date value from the database through the use of a SQL query, which requests
      * the wanted date value, and the arguments for the query to become a proper SQL statement.
-     * 
+     *
      * @param dbConnector For connecting to the database.
-     * @param query The query for retrieving the date.
-     * @param args The arguments for the database statement.
+     * @param query       The query for retrieving the date.
+     * @param args        The arguments for the database statement.
      * @return The date from the given statement.
      * @throws IllegalStateException if the connection could not be established,
-     * if the prepared statement could not be created, or the execution failed
+     *                               if the prepared statement could not be created, or the execution failed
      */
     public static Date selectDateValue(DBConnector dbConnector, String query, Object... args) {
         return retrieveDateValue(dbConnector, true, query, args);
     }
-    
+
     /**
-     * Retrieves the first date value from the database through the use of a SQL query, which requests 
+     * Retrieves the first date value from the database through the use of a SQL query, which requests
      * the wanted date value, and the arguments for the query to become a proper SQL statement.
-     * If the results set contains more than one value, the others are ignored. 
-     * 
+     * If the results set contains more than one value, the others are ignored.
+     *
      * @param dbConnector For connecting to the database.
-     * @param query The query for retrieving the date.
-     * @param args The arguments for the database statement.
+     * @param query       The query for retrieving the date.
+     * @param args        The arguments for the database statement.
      * @return The date from the given statement.
      * @throws IllegalStateException if the connection could not be established,
-     * if the prepared statement could not be created, or the execution failed
+     *                               if the prepared statement could not be created, or the execution failed
      */
     public static Date selectFirstDateValue(DBConnector dbConnector, String query, Object... args) {
         return retrieveDateValue(dbConnector, false, query, args);
     }
-    
+
     /**
      * The actual extraction from the database.
-     * @param dbConnector For connecting to the database.
+     *
+     * @param dbConnector           For connecting to the database.
      * @param mustHaveOnlyOneResult Whether it should fail, if more than one result is found.
-     * @param query The query for retrieving the date.
-     * @param args The arguments for the database statement.
+     * @param query                 The query for retrieving the date.
+     * @param args                  The arguments for the database statement.
      * @return The date from the given statement.
      * @throws IllegalStateException if the connection could not be established,
-     * if the prepared statement could not be created, or the execution failed
+     *                               if the prepared statement could not be created, or the execution failed
      */
     private static Date retrieveDateValue(DBConnector dbConnector, boolean mustHaveOnlyOneResult, String query, Object... args) {
         ArgumentValidator.checkNotNull(dbConnector, "DBConnector dbConnector");
         ArgumentValidator.checkNotNullOrEmpty(query, "String query");
         ArgumentValidator.checkNotNull(args, "Object... args");
-        
+
         try (Connection conn = dbConnector.getConnection();
              PreparedStatement ps = createPreparedStatement(conn, query, args)) {
             try (ResultSet res = ps.executeQuery()) {
@@ -294,17 +302,17 @@ private static Date retrieveDateValue(DBConnector dbConnector, boolean mustHaveO
             throw failedExecutionOfStatement(e, query, args);
         }
     }
-    
+
     /**
-     * Retrieves a String value from the database through the use of a SQL query, which requests 
+     * Retrieves a String value from the database through the use of a SQL query, which requests
      * the wanted String value, and the arguments for the query to become a proper SQL statement.
-     * 
+     *
      * @param dbConnector For connecting to the database.
-     * @param query The query to extract the String value.
-     * @param args The arguments for the statement.
+     * @param query       The query to extract the String value.
+     * @param args        The arguments for the statement.
      * @return The requested string value, or null if no such value could be found.
      * @throws IllegalStateException if the connection could not be established,
-     * if the prepared statement could not be created, or the execution failed
+     *                               if the prepared statement could not be created, or the execution failed
      */
     public static String selectStringValue(DBConnector dbConnector, String query, Object... args) {
         ArgumentValidator.checkNotNull(dbConnector, "DBConnector dbConnector");
@@ -314,7 +322,7 @@ public static String selectStringValue(DBConnector dbConnector, String query, Ob
         try (Connection conn = dbConnector.getConnection();
              PreparedStatement ps = createPreparedStatement(conn, query, args)) {
             try (ResultSet res = ps.executeQuery()) {
-                if(!res.next()) {
+                if (!res.next()) {
                     log.trace("No string was found for the query '" + query + "'. A null has been returned.");
                     return null;
                 }
@@ -324,17 +332,17 @@ public static String selectStringValue(DBConnector dbConnector, String query, Ob
             throw failedExecutionOfStatement(e, query, args);
         }
     }
-    
+
     /**
-     * Retrieves a list of String value from the database through the use of a SQL query, which requests 
+     * Retrieves a list of String value from the database through the use of a SQL query, which requests
      * the wanted list of String value, and the arguments for the query to become a proper SQL statement.
-     * 
+     *
      * @param dbConnector For connecting to the database.
-     * @param query The SQL query for retrieving the strings.
-     * @param args The arguments for the statement.
+     * @param query       The SQL query for retrieving the strings.
+     * @param args        The arguments for the statement.
      * @return The requested list of strings. If no strings were found, then the list is empty.
      * @throws IllegalStateException if the connection could not be established,
-     * if the prepared statement could not be created, or the execution failed
+     *                               if the prepared statement could not be created, or the execution failed
      */
     public static List<String> selectStringList(DBConnector dbConnector, String query, Object... args) {
         ArgumentValidator.checkNotNull(dbConnector, "DBConnector dbConnector");
@@ -344,8 +352,8 @@ public static List<String> selectStringList(DBConnector dbConnector, String quer
         try (Connection conn = dbConnector.getConnection();
              PreparedStatement ps = createPreparedStatement(conn, query, args)) {
             try (ResultSet res = ps.executeQuery()) {
-                 List<String> list = new ArrayList<>();
-                while(res.next()) {
+                List<String> list = new ArrayList<>();
+                while (res.next()) {
                     list.add(res.getString(1));
                 }
                 return list;
@@ -358,36 +366,36 @@ public static List<String> selectStringList(DBConnector dbConnector, String quer
     /**
      * Executing a given statement, which should not return any results.
      * This is intended to be used especially for UPDATE commands.
-     * 
+     *
      * @param dbConnector For connecting to the database.
-     * @param query The SQL query to execute.
-     * @param args The arguments for the SQL statement.
+     * @param query       The SQL query to execute.
+     * @param args        The arguments for the SQL statement.
      * @throws IllegalStateException if the connection could not be established,
-     * if the prepared statement could not be created, or the execution failed
+     *                               if the prepared statement could not be created, or the execution failed
      */
     public static void executeStatement(DBConnector dbConnector, String query, Object... args) throws IllegalStateException {
         ArgumentValidator.checkNotNull(dbConnector, "DBConnector dbConnector");
         ArgumentValidator.checkNotNullOrEmpty(query, "String query");
         ArgumentValidator.checkNotNull(args, "Object... args");
-        
+
         try (Connection conn = dbConnector.getConnection();
              PreparedStatement ps = createPreparedStatement(conn, query, args)) {
-                ps.executeUpdate();
-            } catch (SQLException e) {
+            ps.executeUpdate();
+        } catch (SQLException e) {
             throw failedExecutionOfStatement(e, query, args);
         }
     }
-    
+
     /**
      * Prepare a statement given a query string and some args.
-     *
+     * <p>
      * NB: the provided connection is not closed.
      *
      * @param dbConnection The connection to the database.
-     * @param query a query string  (must not be null or empty)
-     * @param args some args to insert into this query string (must not be null)
+     * @param query        a query string  (must not be null or empty)
+     * @param args         some args to insert into this query string (must not be null)
      * @return a prepared statement
-     * @throws SQLException If unable to prepare a statement
+     * @throws SQLException          If unable to prepare a statement
      * @throws IllegalStateException if any of the args is of an unknown type
      */
     public static PreparedStatement createPreparedStatement(Connection dbConnection, String query, Object... args)
@@ -407,10 +415,10 @@ public static PreparedStatement createPreparedStatement(Connection dbConnection,
             } else if (arg instanceof Date) {
                 s.setTimestamp(i, new Timestamp(((Date) arg).getTime()));
             } else {
-                if(arg == null) {
+                if (arg == null) {
                     throw new IllegalStateException("Cannot handle a null as argument for SQL query. We can only "
-                            + "handle string, int, long, date or boolean args for query: " + query);                    
-                } else  {
+                            + "handle string, int, long, date or boolean args for query: " + query);
+                } else {
                     throw new IllegalStateException("Cannot handle type '" + arg.getClass().getName() + "'. We can only "
                             + "handle string, int, long, date or boolean args for query: " + query);
                 }
@@ -433,20 +441,21 @@ public static PreparedStatement createPreparedStatement(Connection dbConnection,
      * @throws IllegalStateException Always, since it is intended for this method to report the failure.
      */
     private static IllegalStateException failedExecutionOfStatement(Throwable e, String query, Object... args) {
-        return new IllegalStateException("Could not execute the query '" + query + "' with the arguments '" 
+        return new IllegalStateException("Could not execute the query '" + query + "' with the arguments '"
                 + Arrays.asList(args) + "'", e);
     }
-    
+
     /**
      * Method to provide safe dump of database specifics (so we won't leak passwords).
+     *
      * @param databaseSpecifics the specifics of the database, containing sensitive passwords
      * @return the cleaned database specifics as a string
      */
     public static String getDatabaseSpecificsDump(DatabaseSpecifics databaseSpecifics) {
         return "DatabaseSpecifics [driverClass=" + databaseSpecifics.getDriverClass()
-                + ", databaseURL=" + databaseSpecifics.getDatabaseURL() 
+                + ", databaseURL=" + databaseSpecifics.getDatabaseURL()
                 + ", username=" + databaseSpecifics.getUsername()
                 + ", allowAutoMigrate=" + databaseSpecifics.isAllowAutoMigrate()
                 + ", allowAutoCreate=" + databaseSpecifics.isAllowAutoCreate() + "]";
-    } 
+    }
 }
diff --git a/bitrepository-service/src/main/java/org/bitrepository/service/database/SqlScriptRunner.java b/bitrepository-service/src/main/java/org/bitrepository/service/database/SqlScriptRunner.java
index 196d56fc8..607d8ec4b 100644
--- a/bitrepository-service/src/main/java/org/bitrepository/service/database/SqlScriptRunner.java
+++ b/bitrepository-service/src/main/java/org/bitrepository/service/database/SqlScriptRunner.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -35,7 +35,7 @@
 
 /**
  * Runs a sql script as a sequence of JDBC statements.
- *
+ * <p>
  * Slightly modified version of the com.ibatis.common.jdbc.SqlScriptRunner class
  * from the iBATIS Apache project. Only removed dependency on Resource class
  * and a constructor
@@ -43,19 +43,15 @@
 public class SqlScriptRunner {
     private static final String DEFAULT_DELIMITER = ";";
     private static final Logger log = LoggerFactory.getLogger(SqlScriptRunner.class);
-
-    private Connection connection;
-
-    private boolean stopOnError;
-    private boolean autoCommit;
-
+    private final Connection connection;
+    private final boolean stopOnError;
+    private final boolean autoCommit;
     private String delimiter = DEFAULT_DELIMITER;
     private boolean fullLineDelimiter = false;
 
     /**
-     *
-     * @param connection The connection to use
-     * @param autoCommit Enable autocommit
+     * @param connection  The connection to use
+     * @param autoCommit  Enable autocommit
      * @param stopOnError Stop running the script, if a statement fails.
      */
     public SqlScriptRunner(Connection connection,
@@ -67,7 +63,7 @@ public SqlScriptRunner(Connection connection,
     }
 
     /**
-     * @param delimiter The statement delimiter, eg. ';' for mysql.
+     * @param delimiter         The statement delimiter, eg. ';' for mysql.
      * @param fullLineDelimiter <code>true</code> if the delimiter used to distinguish between lines.
      */
     public void setDelimiter(String delimiter, boolean fullLineDelimiter) {
@@ -110,80 +106,75 @@ public void runScript(Reader reader) {
      * @throws IOException  if there is an error reading from the Reader.
      */
     private void runScript(Connection conn, Reader reader) throws IOException, SQLException {
-        StringBuffer command = null;
+        StringBuilder command = null;
         LineNumberReader lineReader = new LineNumberReader(reader);
-        String line = null;
+        String line;
         while ((line = lineReader.readLine()) != null) {
             if (command == null) {
-                command = new StringBuffer();
+                command = new StringBuilder();
             }
             String trimmedLine = line.trim();
-            if (trimmedLine.startsWith("--") ||
-                    trimmedLine.startsWith("//")) {
-                // Ignore comment line
-            } else if (trimmedLine.length() == 0) {
-                // Ignore empty line.
-            } else if (trimmedLine.contains("connect")) {
-                // Ignore connect statement as this is handled in the supplied connection.
-            } else if (!fullLineDelimiter
-                    && trimmedLine.endsWith(getDelimiter())
-                    || fullLineDelimiter
-                    && trimmedLine.equals(getDelimiter())) {
-
-                command.append(trimLineForComment(line).substring(0, line
-                        .lastIndexOf(getDelimiter())));
-                command.append(" ");
-
-                Statement statement = conn.createStatement();
-
-                log.debug("Executing statement: " + command.toString());
-
-                boolean hasResults = false;
-                if (stopOnError) {
-                    hasResults = statement.execute(command.toString());
-                } else {
-                    try {
-                        statement.execute(command.toString());
-                    } catch (SQLException e) {
-                        e.fillInStackTrace();
-                        log.error("Error executing: " + command, e);
+            if (proceedWithLine(trimmedLine)) {
+                if (!fullLineDelimiter
+                        && trimmedLine.endsWith(getDelimiter())
+                        || fullLineDelimiter
+                        && trimmedLine.equals(getDelimiter())) {
+
+                    command.append(trimLineForComment(line), 0, line
+                            .lastIndexOf(getDelimiter()));
+                    command.append(" ");
+
+                    Statement statement = conn.createStatement();
+
+                    log.debug("Executing statement: " + command);
+
+                    boolean hasResults = false;
+                    if (stopOnError) {
+                        hasResults = statement.execute(command.toString());
+                    } else {
+                        try {
+                            statement.execute(command.toString());
+                        } catch (SQLException e) {
+                            e.fillInStackTrace();
+                            log.error("Error executing: " + command, e);
+                        }
                     }
-                }
 
-                if (autoCommit && !conn.getAutoCommit()) {
-                    conn.commit();
-                }
-
-                ResultSet rs = statement.getResultSet();
-                StringBuilder resultSB = new StringBuilder();
-                if (hasResults && rs != null) {
-                    ResultSetMetaData md = rs.getMetaData();
-                    int cols = md.getColumnCount();
-                    for (int i = 0; i < cols; i++) {
-                        String name = md.getColumnLabel(i);
-                        resultSB.append(name + "\t");
+                    if (autoCommit && !conn.getAutoCommit()) {
+                        conn.commit();
                     }
-                    resultSB.append("\n");
-                    while (rs.next()) {
+
+                    ResultSet rs = statement.getResultSet();
+                    StringBuilder resultSB = new StringBuilder();
+                    if (hasResults && rs != null) {
+                        ResultSetMetaData md = rs.getMetaData();
+                        int cols = md.getColumnCount();
                         for (int i = 0; i < cols; i++) {
-                            String value = rs.getString(i);
-                            resultSB.append(value + "\t");
+                            String name = md.getColumnLabel(i);
+                            resultSB.append(name).append("\t");
                         }
                         resultSB.append("\n");
+                        while (rs.next()) {
+                            for (int i = 0; i < cols; i++) {
+                                String value = rs.getString(i);
+                                resultSB.append(value).append("\t");
+                            }
+                            resultSB.append("\n");
+                        }
+                        log.info("Result: " + resultSB);
                     }
-                    log.info("Result: " + resultSB.toString());
-                }
 
-                command = null;
-                try {
-                    statement.close();
-                } catch (Exception e) {
-                    // Ignore to workaround a bug in Jakarta DBCP
+                    command = null;
+                    try {
+                        statement.close();
+                    } catch (Exception e) {
+                        // Ignore to work around a bug in Jakarta DBCP
+                    }
+                    Thread.yield();
+                } else {
+                    command.append(trimLineForComment(line));
+                    command.append(" ");
                 }
-                Thread.yield();
-            } else {
-                command.append(trimLineForComment(line));
-                command.append(" ");
             }
         }
         if (!autoCommit) {
@@ -192,6 +183,15 @@ private void runScript(Connection conn, Reader reader) throws IOException, SQLEx
 
     }
 
+    private boolean proceedWithLine(String trimmedLine) {
+        if (trimmedLine.startsWith("--") ||
+                trimmedLine.startsWith("//")) {
+            return false;
+        } else if (trimmedLine.length() == 0) {
+            return false;
+        } else return !trimmedLine.contains("connect");
+    }
+
     private String trimLineForComment(String line) {
         if (line.contains("--")) {
             return line.substring(0, line.indexOf("--"));
diff --git a/bitrepository-service/src/main/java/org/bitrepository/service/database/UnsupportedDatabaseTypeException.java b/bitrepository-service/src/main/java/org/bitrepository/service/database/UnsupportedDatabaseTypeException.java
index e7d8c1e3a..df277e832 100644
--- a/bitrepository-service/src/main/java/org/bitrepository/service/database/UnsupportedDatabaseTypeException.java
+++ b/bitrepository-service/src/main/java/org/bitrepository/service/database/UnsupportedDatabaseTypeException.java
@@ -8,12 +8,12 @@
  * it under the terms of the GNU Lesser General Public License as
  * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
@@ -22,7 +22,7 @@
 package org.bitrepository.service.database;
 
 /**
- * Exception to indicate that a given database type is not supported.  
+ * Exception to indicate that a given database type is not supported.
  */
 @SuppressWarnings("serial")
 public class UnsupportedDatabaseTypeException extends RuntimeException {
diff --git a/bitrepository-service/src/main/java/org/bitrepository/service/exception/IdentifyContributorException.java b/bitrepository-service/src/main/java/org/bitrepository/service/exception/IdentifyContributorException.java
index 8f2f4a09b..d48ac31a8 100644
--- a/bitrepository-service/src/main/java/org/bitrepository/service/exception/IdentifyContributorException.java
+++ b/bitrepository-service/src/main/java/org/bitrepository/service/exception/IdentifyContributorException.java
@@ -1,23 +1,23 @@
 /*
  * #%L
  * Bitrepository Reference Pillar
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -27,24 +27,22 @@
 import org.bitrepository.bitrepositoryelements.ResponseCode;
 
 /**
- * Exception which wraps bad response information for the identifications. 
+ * Exception which wraps bad response information for the identifications.
  */
 @SuppressWarnings("serial")
 public class IdentifyContributorException extends RequestHandlerException {
     /**
-     * Constructor.
      * @param rCode The response code.
      * @param rText The text for the response info.
      */
     public IdentifyContributorException(ResponseCode rCode, String rText) {
         super(rCode, rText);
     }
-    
+
     /**
-     * Constructor.
      * @param rCode The response code.
      * @param rText The text for the response info.
-     * @param e The exception to wrap into the StackTrace.
+     * @param e     The exception to wrap into the StackTrace.
      */
     public IdentifyContributorException(ResponseCode rCode, String rText, Exception e) {
         super(rCode, rText, e);
diff --git a/bitrepository-service/src/main/java/org/bitrepository/service/exception/IllegalOperationException.java b/bitrepository-service/src/main/java/org/bitrepository/service/exception/IllegalOperationException.java
index 15f018d2e..4cbaf3441 100644
--- a/bitrepository-service/src/main/java/org/bitrepository/service/exception/IllegalOperationException.java
+++ b/bitrepository-service/src/main/java/org/bitrepository/service/exception/IllegalOperationException.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -29,31 +29,29 @@
  */
 @SuppressWarnings("serial")
 public class IllegalOperationException extends RequestHandlerException {
-    private String fileID;
-    
+    private final String fileID;
+
     /**
-     * Constructor.
-     * @param rCode The response code.
-     * @param rText The text for the response info.
+     * @param rCode  The response code.
+     * @param rText  The text for the response info.
      * @param fileID The id of the file regarding the illegal operation. Use null, if no file.
      */
     public IllegalOperationException(ResponseCode rCode, String rText, String fileID) {
         super(rCode, rText);
         this.fileID = fileID;
     }
-    
+
     /**
-     * Constructor.
-     * @param rCode The response code.
-     * @param rText The text for the response info.
+     * @param rCode  The response code.
+     * @param rText  The text for the response info.
      * @param fileID The id of the file regarding the illegal operation. Use null, if no file.
-     * @param e The exception to wrap into the StackTrace.
+     * @param e      The exception to wrap into the StackTrace.
      */
     public IllegalOperationException(ResponseCode rCode, String rText, String fileID, Exception e) {
         super(rCode, rText, e);
         this.fileID = fileID;
     }
-    
+
     /**
      * @return fileID field.
      */
diff --git a/bitrepository-service/src/main/java/org/bitrepository/service/exception/InvalidMessageException.java b/bitrepository-service/src/main/java/org/bitrepository/service/exception/InvalidMessageException.java
index f1f0254b9..76480b4c2 100644
--- a/bitrepository-service/src/main/java/org/bitrepository/service/exception/InvalidMessageException.java
+++ b/bitrepository-service/src/main/java/org/bitrepository/service/exception/InvalidMessageException.java
@@ -1,23 +1,23 @@
 /*
  * #%L
  * Bitrepository Reference Pillar
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -28,31 +28,28 @@
 import org.bitrepository.bitrepositoryelements.ResponseInfo;
 
 /**
- * Exception which wraps bad response information for the validation of the operation requests. 
+ * Exception which wraps bad response information for the validation of the operation requests.
  */
 @SuppressWarnings("serial")
 public class InvalidMessageException extends RequestHandlerException {
     /**
-     * Constructor.
      * @param rCode The response code.
      * @param rText The text for the response info.
      */
     public InvalidMessageException(ResponseCode rCode, String rText) {
         super(rCode, rText);
     }
-    
+
     /**
-     * Constructor.
      * @param rCode The response code.
      * @param rText The text for the response info.
-     * @param e The exception to wrap into the StackTrace.
+     * @param e     The exception to wrap into the StackTrace.
      */
     public InvalidMessageException(ResponseCode rCode, String rText, Exception e) {
         super(rCode, rText, e);
     }
-    
+
     /**
-     * Constructor.
      * @param rInfo The response info.
      */
     public InvalidMessageException(ResponseInfo rInfo) {
diff --git a/bitrepository-service/src/main/java/org/bitrepository/service/exception/RequestHandlerException.java b/bitrepository-service/src/main/java/org/bitrepository/service/exception/RequestHandlerException.java
index 2bbf4e8a6..73b9cb11a 100644
--- a/bitrepository-service/src/main/java/org/bitrepository/service/exception/RequestHandlerException.java
+++ b/bitrepository-service/src/main/java/org/bitrepository/service/exception/RequestHandlerException.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -29,11 +29,12 @@
  */
 @SuppressWarnings("serial")
 public abstract class RequestHandlerException extends Exception {
-    /** The ResponseInfo wrapped by this exception. Tells the reason for the exception.*/
+    /**
+     * The ResponseInfo wrapped by this exception. Tells the reason for the exception.
+     */
     private final ResponseInfo responseInfo;
-    
+
     /**
-     * Constructor.
      * @param rCode The response code.
      * @param rText The text for the response info.
      */
@@ -43,12 +44,11 @@ public RequestHandlerException(ResponseCode rCode, String rText) {
         this.responseInfo.setResponseCode(rCode);
         this.responseInfo.setResponseText(rText);
     }
-    
+
     /**
-     * Constructor.
      * @param rCode The response code.
      * @param rText The text for the response info.
-     * @param e The exception to wrap into the StackTrace.
+     * @param e     The exception to wrap into the StackTrace.
      */
     public RequestHandlerException(ResponseCode rCode, String rText, Exception e) {
         super(rText, e);
@@ -56,23 +56,22 @@ public RequestHandlerException(ResponseCode rCode, String rText, Exception e) {
         this.responseInfo.setResponseCode(rCode);
         this.responseInfo.setResponseText(rText);
     }
-    
+
     /**
-     * Constructor.
      * @param rInfo The response info.
      */
     public RequestHandlerException(ResponseInfo rInfo) {
         super(rInfo.getResponseText());
         this.responseInfo = rInfo;
     }
-    
+
     /**
      * @return The wrapped ResponseInfo.
      */
     public ResponseInfo getResponseInfo() {
         return responseInfo;
     }
-    
+
     @Override
     public String toString() {
         return super.toString() + ", " + responseInfo.toString();
diff --git a/bitrepository-service/src/main/java/org/bitrepository/service/exception/StepFailedException.java b/bitrepository-service/src/main/java/org/bitrepository/service/exception/StepFailedException.java
index 3c876ce53..1c16997a3 100644
--- a/bitrepository-service/src/main/java/org/bitrepository/service/exception/StepFailedException.java
+++ b/bitrepository-service/src/main/java/org/bitrepository/service/exception/StepFailedException.java
@@ -8,12 +8,12 @@
  * it under the terms of the GNU Lesser General Public License as
  * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
@@ -24,12 +24,13 @@
 /**
  * StepFailedException allows communicating to the upstream fault barrier that a step failed.
  */
+@SuppressWarnings("serial")
 public class StepFailedException extends Exception {
 
     public StepFailedException(String message, Exception e) {
         super(message, e);
     }
-    
+
     public StepFailedException(String message) {
         super(message);
     }
diff --git a/bitrepository-service/src/main/java/org/bitrepository/service/exception/WorkflowAbortedException.java b/bitrepository-service/src/main/java/org/bitrepository/service/exception/WorkflowAbortedException.java
index e4f73a966..ca737cbdd 100644
--- a/bitrepository-service/src/main/java/org/bitrepository/service/exception/WorkflowAbortedException.java
+++ b/bitrepository-service/src/main/java/org/bitrepository/service/exception/WorkflowAbortedException.java
@@ -8,12 +8,12 @@
  * it under the terms of the GNU Lesser General Public License as
  * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
@@ -22,8 +22,9 @@
 package org.bitrepository.service.exception;
 
 /**
- * WorkflowAbortedException allows to communicate to an upstream fault barrier that the workflow aborted.
+ * WorkflowAbortedException allows communicating to an upstream fault barrier that the workflow aborted.
  */
+@SuppressWarnings("serial")
 public class WorkflowAbortedException extends Exception {
 
     public WorkflowAbortedException(String message) {
diff --git a/bitrepository-service/src/main/java/org/bitrepository/service/scheduler/JobEventListener.java b/bitrepository-service/src/main/java/org/bitrepository/service/scheduler/JobEventListener.java
index 2274ed7fe..828abc906 100644
--- a/bitrepository-service/src/main/java/org/bitrepository/service/scheduler/JobEventListener.java
+++ b/bitrepository-service/src/main/java/org/bitrepository/service/scheduler/JobEventListener.java
@@ -1,20 +1,20 @@
 package org.bitrepository.service.scheduler;/*
  * #%L
- * Bitrepository Integrity Service
+ * BitRepository Integrity Service
  * %%
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
diff --git a/bitrepository-service/src/main/java/org/bitrepository/service/scheduler/JobScheduler.java b/bitrepository-service/src/main/java/org/bitrepository/service/scheduler/JobScheduler.java
index 5d6698611..80f807e91 100644
--- a/bitrepository-service/src/main/java/org/bitrepository/service/scheduler/JobScheduler.java
+++ b/bitrepository-service/src/main/java/org/bitrepository/service/scheduler/JobScheduler.java
@@ -1,23 +1,23 @@
 /*
  * #%L
  * Bitrepository Integrity Client
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -36,7 +36,8 @@
 public interface JobScheduler {
     /**
      * Adds a job for the scheduler to schedule.
-     * @param job The job to schedule.
+     *
+     * @param job      The job to schedule.
      * @param interval The interval for how often the job should be triggered.
      */
     void schedule(SchedulableJob job, Long interval);
@@ -52,7 +53,8 @@ public interface JobScheduler {
 
     /**
      * Reschedules the job to start now,
-     * @param job the jobn to start
+     *
+     * @param job the job to start
      * @return A string indicating the result of the attempt to start the job.
      */
     String startJob(SchedulableJob job);
@@ -71,6 +73,7 @@ public interface JobScheduler {
 
     /**
      * Enables other objects to listen for job events.
+     *
      * @param listener The callback listener to receive the events.
      */
     void addJobEventListener(JobEventListener listener);
diff --git a/bitrepository-service/src/main/java/org/bitrepository/service/scheduler/TimerbasedScheduler.java b/bitrepository-service/src/main/java/org/bitrepository/service/scheduler/TimerBasedScheduler.java
similarity index 80%
rename from bitrepository-service/src/main/java/org/bitrepository/service/scheduler/TimerbasedScheduler.java
rename to bitrepository-service/src/main/java/org/bitrepository/service/scheduler/TimerBasedScheduler.java
index 010926ad7..3db8615b0 100644
--- a/bitrepository-service/src/main/java/org/bitrepository/service/scheduler/TimerbasedScheduler.java
+++ b/bitrepository-service/src/main/java/org/bitrepository/service/scheduler/TimerBasedScheduler.java
@@ -1,37 +1,29 @@
 /*
  * #%L
  * Bitrepository Integrity Client
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
  */
 package org.bitrepository.service.scheduler;
 
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Timer;
-
 import org.bitrepository.common.utils.TimeUtils;
 import org.bitrepository.service.workflow.JobID;
 import org.bitrepository.service.workflow.JobTimerTask;
@@ -40,39 +32,41 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Timer;
+
 /**
  * Scheduler that uses Timer to run workflows.
  */
-public class TimerbasedScheduler implements JobScheduler {
-    private Logger log = LoggerFactory.getLogger(getClass());
-
-    /** The timer that schedules events. */
+public class TimerBasedScheduler implements JobScheduler {
+    private final Logger log = LoggerFactory.getLogger(getClass());
     private final Timer timer;
-    /** The map between the running timertasks and their names. */
-    private Map<JobID, JobTimerTask> intervalTasks = new HashMap<>();
+    private final Map<JobID, JobTimerTask> intervalTasks = new HashMap<>();
     public static final long SCHEDULE_INTERVAL = 60000;
-
-    /** The name of the timer.*/
     private static final String TIMER_NAME = "Service Scheduler";
-    /** Whether the timer is a daemon.*/
     private static final boolean TIMER_IS_DAEMON = true;
-    /** A timer delay of 0 seconds.*/
     private static final Long NO_DELAY = 0L;
-    private List<JobEventListener> jobListeners = new LinkedList<>();
+    private final List<JobEventListener> jobListeners = new LinkedList<>();
 
-    /** Setup a timer task for running the workflows at requested interval.
+    /**
+     * Sets up a timer task for running the workflows at requested interval.
      */
-    public TimerbasedScheduler() {
+    public TimerBasedScheduler() {
         timer = new Timer(TIMER_NAME, TIMER_IS_DAEMON);
     }
 
     @Override
     public void schedule(SchedulableJob workflow, Long interval) {
-        log.info("Scheduling job : " + workflow.getJobID() + " to run every " 
+        log.info("Scheduling job : " + workflow.getJobID() + " to run every "
                 + TimeUtils.millisecondsToHuman(interval));
-        
+
         JobTimerTask task = new JobTimerTask(interval, workflow, Collections.unmodifiableList(jobListeners));
-        if(interval > 0) {
+        if (interval > 0) {
             scheduleJob(task);
         }
 
@@ -82,8 +76,8 @@ public void schedule(SchedulableJob workflow, Long interval) {
     @Override
     public String startJob(SchedulableJob job) {
         log.debug("Starting job: " + job);
-        if(job.currentState() != WorkflowState.NOT_RUNNING) {
-            log.info("Cannot schedule job,'" + job.getJobID() + "', which is in state '" 
+        if (job.currentState() != WorkflowState.NOT_RUNNING) {
+            log.info("Cannot schedule job,'" + job.getJobID() + "', which is in state '"
                     + job.currentState() + "'");
             return "Already running";
         }
@@ -121,23 +115,24 @@ public void addJobEventListener(JobEventListener listener) {
     @Override
     public JobTimerTask cancelJob(JobID jobID) {
         JobTimerTask task = intervalTasks.remove(jobID);
-        if(task == null) {
+        if (task == null) {
             return null;
         }
         task.cancel();
 
         return task;
     }
-    
+
     /**
-     * Schedules a task. 
-     * If the interval for the task is > 0, then it should be scheduled to run at fixed interval, 
-     * but it if has a non-positive interval, then it should only be scheduled for one run.
+     * Schedules a task.
+     * If the interval for the task is > 0, then it should be scheduled to run at fixed interval,
+     * but if it has a non-positive interval, then it should only be scheduled for one run.
+     *
      * @param task The task to schedule.
      */
     private void scheduleJob(JobTimerTask task) {
-        if(task.getIntervalBetweenRuns() > 0) {
-            timer.scheduleAtFixedRate(task, NO_DELAY, SCHEDULE_INTERVAL);            
+        if (task.getIntervalBetweenRuns() > 0) {
+            timer.scheduleAtFixedRate(task, NO_DELAY, SCHEDULE_INTERVAL);
         } else {
             timer.schedule(task, NO_DELAY);
         }
diff --git a/bitrepository-service/src/main/java/org/bitrepository/service/workflow/AbstractWorkFlowStep.java b/bitrepository-service/src/main/java/org/bitrepository/service/workflow/AbstractWorkFlowStep.java
index 49c5dc973..d0b8560bd 100644
--- a/bitrepository-service/src/main/java/org/bitrepository/service/workflow/AbstractWorkFlowStep.java
+++ b/bitrepository-service/src/main/java/org/bitrepository/service/workflow/AbstractWorkFlowStep.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
diff --git a/bitrepository-service/src/main/java/org/bitrepository/service/workflow/JobID.java b/bitrepository-service/src/main/java/org/bitrepository/service/workflow/JobID.java
index 0c9e01dba..66d7618a2 100644
--- a/bitrepository-service/src/main/java/org/bitrepository/service/workflow/JobID.java
+++ b/bitrepository-service/src/main/java/org/bitrepository/service/workflow/JobID.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2013 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -27,16 +27,16 @@
 public class JobID {
     private final String collectionID;
     private final String workflowName;
-    
+
     public JobID(String workflowName, String collectionID) {
         this.collectionID = collectionID;
         this.workflowName = workflowName;
     }
-    
+
     public String getWorkflowName() {
         return workflowName;
     }
-    
+
     public String getCollectionID() {
         return collectionID;
     }
@@ -67,14 +67,11 @@ public boolean equals(Object obj) {
         } else if (!collectionID.equals(other.collectionID))
             return false;
         if (workflowName == null) {
-            if (other.workflowName != null)
-                return false;
-        } else if (!workflowName.equals(other.workflowName))
-            return false;
-        return true;
+            return other.workflowName == null;
+        } else return workflowName.equals(other.workflowName);
     }
-    
-    @Override 
+
+    @Override
     public String toString() {
         return workflowName + "-" + collectionID;
     }
diff --git a/bitrepository-service/src/main/java/org/bitrepository/service/workflow/JobTimerTask.java b/bitrepository-service/src/main/java/org/bitrepository/service/workflow/JobTimerTask.java
index c4f403092..5536d5aac 100644
--- a/bitrepository-service/src/main/java/org/bitrepository/service/workflow/JobTimerTask.java
+++ b/bitrepository-service/src/main/java/org/bitrepository/service/workflow/JobTimerTask.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -34,21 +34,18 @@
  * Used for scheduling workflows to run continuously at a given interval.
  */
 public class JobTimerTask extends TimerTask {
-    /** The log.*/
-    private Logger log = LoggerFactory.getLogger(getClass());
-    /** The date for the next run of the workflow.*/
+    private final Logger log = LoggerFactory.getLogger(getClass());
     private Date nextRun;
-    /** The interval between triggers. */
     private final long interval;
     private final SchedulableJob job;
-    private List<JobEventListener> jobListeners; 
+    private final List<JobEventListener> jobListeners;
 
     /**
      * Initialise trigger.
      *
      * @param interval     The interval between triggering events in milliseconds.
      * @param job          The job.
-     * @param jobListeners eventlisteners for this job.
+     * @param jobListeners event listeners for this job.
      */
     public JobTimerTask(long interval, SchedulableJob job, List<JobEventListener> jobListeners) {
         this.interval = interval;
@@ -61,8 +58,8 @@ public JobTimerTask(long interval, SchedulableJob job, List<JobEventListener> jo
      * @return The date for the next time the encapsulated workflow should run.
      */
     public Date getNextRun() {
-        if(interval > 0) {
-            return new Date(nextRun.getTime());            
+        if (interval > 0) {
+            return new Date(nextRun.getTime());
         } else {
             return null;
         }
@@ -93,10 +90,8 @@ public void runJob() {
                     nextRun = new Date(System.currentTimeMillis() + interval);
                 }
                 notifyListenersAboutFinishedJob(job);
-                return;
             } else {
                 log.info("Ignoring start request for " + job.getJobID() + " the job is already running");
-                return;
             }
         } catch (Throwable e) {
             log.error("Fault barrier for '" + job.getJobID() + "' caught unexpected exception.", e);
@@ -104,7 +99,7 @@ public void runJob() {
     }
 
     private void notifyListenersAboutFinishedJob(SchedulableJob job) {
-        for (JobEventListener listener:jobListeners) {
+        for (JobEventListener listener : jobListeners) {
             listener.jobFinished(job);
         }
     }
@@ -115,15 +110,15 @@ private void notifyListenersAboutFinishedJob(SchedulableJob job) {
     public String getName() {
         return job.getJobID().toString();
     }
-    
+
     public JobID getWorkflowID() {
         return job.getJobID();
     }
 
     @Override
     public void run() {
-        if( nextRun != null && (getNextRun() == null || 
-            getNextRun().getTime() <= System.currentTimeMillis())) {
+        if (nextRun != null && (getNextRun() == null ||
+                getNextRun().getTime() <= System.currentTimeMillis())) {
             runJob();
         }
     }
diff --git a/bitrepository-service/src/main/java/org/bitrepository/service/workflow/SchedulableJob.java b/bitrepository-service/src/main/java/org/bitrepository/service/workflow/SchedulableJob.java
index af8809583..87e82842f 100644
--- a/bitrepository-service/src/main/java/org/bitrepository/service/workflow/SchedulableJob.java
+++ b/bitrepository-service/src/main/java/org/bitrepository/service/workflow/SchedulableJob.java
@@ -1,23 +1,23 @@
 /*
  * #%L
  * Bitrepository Integrity Client
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2011 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -27,42 +27,43 @@
 
 /**
  * Interface for defining a SchedulableJob.
- * A SchedulableJob performs a given task for the respective service. 
+ * A SchedulableJob performs a given task for the respective service.
  */
 public interface SchedulableJob {
     /**
      * Start the SchedulableJob.
      */
     void start();
-    
+
     /**
      * @return The current state of the SchedulableJob.
      */
     WorkflowState currentState();
-    
+
     /**
      * @param newState The new state for the workflow.
      */
     void setCurrentState(WorkflowState newState);
-    
+
     /**
-     * @return A human readable text telling the current state of the SchedulableJob.
+     * @return A human-readable text telling the current state of the SchedulableJob.
      */
     String getHumanReadableState();
-    
+
     /**
-     * @return Provides a human readable description of the SchedulableJob.
+     * @return Provides a human-readable description of the SchedulableJob.
      */
     String getDescription();
-    
+
     /**
-     *  @return Provides an ID to identify the SchedulableJob on.
+     * @return Provides an ID to identify the SchedulableJob on.
      */
     JobID getJobID();
 
     /**
      * Initializes a SchedulableJob with a context and a collection to run the SchedulableJob on.
-     * @param context workflow context.
+     *
+     * @param context      workflow context.
      * @param collectionID collection id.
      */
     void initialise(WorkflowContext context, String collectionID);
diff --git a/bitrepository-service/src/main/java/org/bitrepository/service/workflow/Workflow.java b/bitrepository-service/src/main/java/org/bitrepository/service/workflow/Workflow.java
index 7d8315cf2..0ee520a70 100644
--- a/bitrepository-service/src/main/java/org/bitrepository/service/workflow/Workflow.java
+++ b/bitrepository-service/src/main/java/org/bitrepository/service/workflow/Workflow.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -27,20 +27,15 @@
 
 /**
  * Abstract interface for running a SchedulableJob based on WorkflowSteps.
+ *
  * @see SchedulableJob {@link SchedulableJob}
- * @see WorkflowStep {@link WorkflowStep} 
+ * @see WorkflowStep {@link WorkflowStep}
  */
 public abstract class Workflow implements SchedulableJob {
-    /** The jobID. */
     protected JobID jobID;
-    /** The log.*/
-    private Logger log = LoggerFactory.getLogger(getClass());
-
-    /** The current step running.*/
+    private final Logger log = LoggerFactory.getLogger(getClass());
     private WorkflowStep currentStep = null;
-    /** The current state of the workflow. */
     private WorkflowState currentState = WorkflowState.NOT_RUNNING;
-    /** Statistics for the workflow.*/
     private WorkflowStatistic statistics;
 
     @Override
@@ -51,10 +46,11 @@ public synchronized void start() {
 
     /**
      * Initiates the given step and sets it to the current running step.
+     *
      * @param step The step to start.
      */
     protected void performStep(WorkflowStep step) {
-        if(currentState != WorkflowState.ABORTED) {
+        if (currentState != WorkflowState.ABORTED) {
             this.currentState = WorkflowState.RUNNING;
             this.currentStep = step;
             log.info("Starting step: '" + step.getName() + "'");
@@ -63,7 +59,7 @@ protected void performStep(WorkflowStep step) {
                 step.performStep();
             } catch (WorkflowAbortedException e) {
                 this.currentState = WorkflowState.ABORTED;
-                log.warn("Failure occured, aborting workflow", e);
+                log.warn("Failure occurred, aborting workflow", e);
             } catch (Exception e) {
                 log.error("Failure in step: '" + step.getName() + "'.", e);
                 throw new RuntimeException("Failed to run step " + step.getName(), e);
@@ -73,7 +69,7 @@ protected void performStep(WorkflowStep step) {
             }
         }
     }
-    
+
     /**
      * For telling that the workflow has finished its task.
      */
@@ -83,15 +79,16 @@ protected void finish() {
         this.currentStep = null;
         log.info(statistics.getFullStatistics());
     }
-    
+
     /**
      * Get the final state of the workflow.
+     *
      * @return ABORTED if current state is ABORTED, SUCCEEDED otherwise.
      */
     private WorkflowState getFinishedWorkflowStatus() {
         return (currentState == WorkflowState.ABORTED ? WorkflowState.ABORTED : WorkflowState.SUCCEEDED);
     }
-    
+
     @Override
     public WorkflowState currentState() {
         return currentState;
@@ -104,7 +101,7 @@ public void setCurrentState(WorkflowState newState) {
 
     @Override
     public String getHumanReadableState() {
-        if(currentStep == null) {
+        if (currentStep == null) {
             return currentState.name();
         } else {
             return currentStep.getName();
@@ -115,7 +112,7 @@ public String getHumanReadableState() {
      * @return The statistics for this workflow.
      */
     public synchronized WorkflowStatistic getWorkflowStatistics() {
-        if(statistics == null) {
+        if (statistics == null) {
             statistics = new WorkflowStatistic(getClass().getSimpleName());
         }
         return statistics;
@@ -131,9 +128,7 @@ public boolean equals(Object o) {
         if (this == o) return true;
         Workflow that = (Workflow) o;
 
-        if (!jobID.equals(that.jobID)) return false;
-
-        return true;
+        return jobID.equals(that.jobID);
     }
 
     @Override
diff --git a/bitrepository-service/src/main/java/org/bitrepository/service/workflow/WorkflowContext.java b/bitrepository-service/src/main/java/org/bitrepository/service/workflow/WorkflowContext.java
index f7668a502..f88914fe8 100644
--- a/bitrepository-service/src/main/java/org/bitrepository/service/workflow/WorkflowContext.java
+++ b/bitrepository-service/src/main/java/org/bitrepository/service/workflow/WorkflowContext.java
@@ -1,20 +1,20 @@
 package org.bitrepository.service.workflow;/*
  * #%L
- * Bitrepository Integrity Service
+ * BitRepository Integrity Service
  * %%
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
diff --git a/bitrepository-service/src/main/java/org/bitrepository/service/workflow/WorkflowManager.java b/bitrepository-service/src/main/java/org/bitrepository/service/workflow/WorkflowManager.java
index 00a361716..cd36c0188 100644
--- a/bitrepository-service/src/main/java/org/bitrepository/service/workflow/WorkflowManager.java
+++ b/bitrepository-service/src/main/java/org/bitrepository/service/workflow/WorkflowManager.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -39,7 +39,6 @@
 
 /**
  * WorkflowManager manages one or more workflows including statistics and monitors state.
- *
  */
 public abstract class WorkflowManager {
     private final Logger log = LoggerFactory.getLogger(this.getClass());
@@ -84,7 +83,7 @@ public WorkflowStatistic getLastCompleteStatistics(JobID workflowID) {
         getWorkflow(workflowID);
         if (statistics.containsKey(workflowID)) {
             List<WorkflowStatistic> stats = statistics.get(workflowID);
-            return stats.get(stats.size()-1);
+            return stats.get(stats.size() - 1);
         } else return null;
     }
 
@@ -113,21 +112,21 @@ public long getRunInterval(JobID jobID) {
     }
 
     private void loadWorkFlows(WorkflowSettings configuration) {
-        for (WorkflowConfiguration workflowConf:configuration.getWorkflow()) {
+        for (WorkflowConfiguration workflowConf : configuration.getWorkflow()) {
             log.info("Scheduling from configuration: " + workflowConf);
             List<String> unscheduledCollections = new LinkedList<>(SettingsUtils.getAllCollectionsIDs());
             try {
                 if (workflowConf.getSchedules() != null) {
-                    for (Schedule schedule:workflowConf.getSchedules().getSchedule()) {
+                    for (Schedule schedule : workflowConf.getSchedules().getSchedule()) {
                         List<String> collectionsToScheduleWorkflowFor;
                         if (schedule.isSetCollections()) {
                             collectionsToScheduleWorkflowFor = schedule.getCollections().getCollectionID();
                         } else {
                             collectionsToScheduleWorkflowFor = SettingsUtils.getAllCollectionsIDs();
                         }
-                        for (String collectionID:collectionsToScheduleWorkflowFor) {
+                        for (String collectionID : collectionsToScheduleWorkflowFor) {
                             Workflow workflow =
-                                    (Workflow)lookupClass(workflowConf.getWorkflowClass()).getDeclaredConstructor().newInstance();
+                                    (Workflow) lookupClass(workflowConf.getWorkflowClass()).getDeclaredConstructor().newInstance();
                             workflow.initialise(context, collectionID);
                             scheduler.schedule(workflow, schedule.getWorkflowInterval());
                             addWorkflow(collectionID, workflow);
@@ -136,9 +135,9 @@ private void loadWorkFlows(WorkflowSettings configuration) {
                     }
                 }
                 // Create a instance of all workflows not explicitly scheduled.
-                for (String collectionID:unscheduledCollections) {
+                for (String collectionID : unscheduledCollections) {
                     Workflow workflow =
-                            (Workflow)Class.forName(workflowConf.getWorkflowClass()).getDeclaredConstructor().newInstance();
+                            (Workflow) Class.forName(workflowConf.getWorkflowClass()).getDeclaredConstructor().newInstance();
                     workflow.initialise(context, collectionID);
                     addWorkflow(collectionID, workflow);
                 }
@@ -167,8 +166,9 @@ private void addWorkflow(String collectionID, Workflow workflow) {
     }
 
     /**
-     * Allows subclasses to define a workflow package where workflow classes defined with a simplename in the settings
+     * Allows subclasses to define a workflow package where workflow classes defined with a simple name in the settings
      * will be prefixed with the namespace defined here.
+     *
      * @return default workflow package string.
      */
     protected abstract String getDefaultWorkflowPackage();
@@ -186,7 +186,8 @@ public void jobFailed(SchedulableJob job) {}
         /**
          * Adds the workflow statistics to the statistics list for this workflow. Will also remove older statistics
          * if the number of statistics exceeds <code>MAX_NUMBER_OF_STATISTICS_FOR_A_WORKFLOW</code>.
-         * @param job The job which finished and to add statistics from 
+         *
+         * @param job The job which finished and to add statistics from
          */
         @Override
         public void jobFinished(SchedulableJob job) {
@@ -196,7 +197,7 @@ public void jobFinished(SchedulableJob job) {
                 }
 
                 List<WorkflowStatistic> workflowStatistics = statistics.get(job.getJobID());
-                workflowStatistics.add((((Workflow)job).getWorkflowStatistics()));
+                workflowStatistics.add((((Workflow) job).getWorkflowStatistics()));
                 if (workflowStatistics.size() > MAX_NUMBER_OF_STATISTICS_FOR_A_WORKFLOW) {
                     workflowStatistics.remove(0);
                 }
diff --git a/bitrepository-service/src/main/java/org/bitrepository/service/workflow/WorkflowState.java b/bitrepository-service/src/main/java/org/bitrepository/service/workflow/WorkflowState.java
index 569e40fca..aa9631954 100644
--- a/bitrepository-service/src/main/java/org/bitrepository/service/workflow/WorkflowState.java
+++ b/bitrepository-service/src/main/java/org/bitrepository/service/workflow/WorkflowState.java
@@ -1,23 +1,23 @@
 /*
  * #%L
  * Bitrepository Service
- * 
+ *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -31,31 +31,25 @@
  */
 @XmlRootElement
 public enum WorkflowState {
-    /** When the workflow is not running.*/
     NOT_RUNNING("Not running"),
-    /** When the workflow is waiting to be run.*/
     WAITING("Waiting"),
-    /** When the workflow is running.*/
     RUNNING("Running"),
-    /** When an execution of the workflow has been aborted. */
     ABORTED("Aborted"),
-    /** When the workflow have finished. */
     SUCCEEDED("Succeeded");
-    
+
     /**
-     * Constructor.
-     * @param humanName Human readable form of the enum.
+     * @param humanName Human-readable form of the enum.
      */
     WorkflowState(String humanName) {
         this.humanName = humanName;
     }
-    
+
     /**
-     * Human readable text of the enum.
+     * Human-readable text of the enum.
      */
-    private String humanName;
-    
-    @Override 
+    private final String humanName;
+
+    @Override
     public String toString() {
         return humanName;
     }
diff --git a/bitrepository-service/src/main/java/org/bitrepository/service/workflow/WorkflowStatistic.java b/bitrepository-service/src/main/java/org/bitrepository/service/workflow/WorkflowStatistic.java
index 724d7a869..ab2d86557 100644
--- a/bitrepository-service/src/main/java/org/bitrepository/service/workflow/WorkflowStatistic.java
+++ b/bitrepository-service/src/main/java/org/bitrepository/service/workflow/WorkflowStatistic.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -29,7 +29,7 @@
 import java.util.List;
 
 /**
- * Provides details about the statistics of an workflow. The statistics will not be fully populated until the
+ * Provides details about the statistics of a workflow. The statistics will not be fully populated until the
  * workflow has finished.
  */
 public class WorkflowStatistic {
@@ -43,6 +43,7 @@ public class WorkflowStatistic {
 
     /**
      * Creates a fresh <code>WorkflowStatistic</code> instance.
+     *
      * @param name The name of this instance to be used as title for the statistics.
      */
     public WorkflowStatistic(String name) {
@@ -57,8 +58,9 @@ public void start() {
     }
 
     /**
-     * Marks the start time of a sub step of the statistics statistics.
-     * @param name The name of the substep to be used as identifier in the statistics.
+     * Marks the start time of a sub step of the statistics.
+     *
+     * @param name The name of the sub-step to be used as identifier in the statistics.
      */
     public void startSubStatistic(String name) {
         subStatistics.add(new WorkflowStatistic(name));
@@ -66,7 +68,8 @@ public void startSubStatistic(String name) {
     }
 
     /**
-     * Marks the end time of a sub step of the statistics statistics.
+     * Marks the end time of a sub step of the statistics.
+     *
      * @param state what state the sub step ended in.
      */
     public void finishSubStatistic(WorkflowState state) {
@@ -74,30 +77,30 @@ public void finishSubStatistic(WorkflowState state) {
     }
 
     /**
-     * @return A string representation of statistics, including all substatistics.
+     * @return A string representation of statistics, including all sub-statistics.
      */
     public String getFullStatistics() {
         if (start == null) {
             return "Haven't finished a run yet";
         }
         StringBuilder sb = new StringBuilder();
-        sb.append(getName() + " duration: " + TimeUtils.millisecondsToHuman(getDuration()));
-        for (WorkflowStatistic stepStat: subStatistics) {
-            sb.append(LINEFEED +stepStat.getFullStatistics());
+        sb.append(getName()).append(" duration: ").append(TimeUtils.millisecondsToHuman(getDuration()));
+        for (WorkflowStatistic stepStat : subStatistics) {
+            sb.append(LINEFEED).append(stepStat.getFullStatistics());
         }
         return sb.toString();
     }
 
     /**
      * Humanly readable string indicating how long the current step has run and the total time the workflow has flown.
+     *
      * @return a string of the form 'step duration'/'workflow duration'. If the workflow isn't running
      * a "Not running" string will be returned.
      */
     public String getPartStatistics() {
         if (start == null) {
             return "Not started yet";
-        }
-        else if (finish != null ) {
+        } else if (finish != null) {
             return "Idle";
         } else {
             WorkflowStatistic currentSubStatistic = getCurrentSubStatistic();
@@ -110,16 +113,18 @@ else if (finish != null ) {
 
     /**
      * Helper to get the status of the latest step.
+     *
      * @return statistics for the current step if the workflow statistics have an active step.
      */
     public WorkflowStatistic getCurrentSubStatistic() {
         if (subStatistics.isEmpty() || finish != null) {
             return null;
-        } else return subStatistics.get(subStatistics.size()-1);
+        } else return subStatistics.get(subStatistics.size() - 1);
     }
 
     /**
      * Get the start date of the statistics.
+     *
      * @return starting time as a Date.
      */
     public Date getStart() {
@@ -128,22 +133,25 @@ public Date getStart() {
 
     /**
      * Get the finish date of the statistics.
+     *
      * @return finish time as a Date.
      */
     public Date getFinish() {
         return finish;
     }
-    
+
     /**
      * Get the final state of the workflow.
+     *
      * @return the final state of the workflow as a WorkflowState.
      */
     public WorkflowState getFinishState() {
         return finishState;
     }
-    
+
     /**
      * Mark this part of the workflow as finished.
+     *
      * @param finishState The state at which the workflow (or step) finished at
      */
     public void finish(WorkflowState finishState) {
diff --git a/bitrepository-service/src/main/java/org/bitrepository/service/workflow/WorkflowStep.java b/bitrepository-service/src/main/java/org/bitrepository/service/workflow/WorkflowStep.java
index a1ff036d2..81a14a078 100644
--- a/bitrepository-service/src/main/java/org/bitrepository/service/workflow/WorkflowStep.java
+++ b/bitrepository-service/src/main/java/org/bitrepository/service/workflow/WorkflowStep.java
@@ -5,16 +5,16 @@
  * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation, either version 2.1 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public 
+ *
+ * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-2.1.html>.
  * #L%
@@ -32,10 +32,11 @@ public interface WorkflowStep {
      * @return The name of this given step in the workflow.
      */
     String getName();
-    
+
     /**
      * Perform the task wrapped in this step.
-     * @throws StepFailedException if the task failed
+     *
+     * @throws StepFailedException      if the task failed
      * @throws WorkflowAbortedException if the workflow was aborted
      */
     void performStep() throws StepFailedException, WorkflowAbortedException;
diff --git a/bitrepository-service/src/test/java/org/bitrepository/service/audit/AuditTrailContributorDatabaseMigrationTest.java b/bitrepository-service/src/test/java/org/bitrepository/service/audit/AuditTrailContributorDatabaseMigrationTest.java
index cbb62f48d..0be217d7c 100644
--- a/bitrepository-service/src/test/java/org/bitrepository/service/audit/AuditTrailContributorDatabaseMigrationTest.java
+++ b/bitrepository-service/src/test/java/org/bitrepository/service/audit/AuditTrailContributorDatabaseMigrationTest.java
@@ -35,9 +35,9 @@
 
 import java.io.File;
 
-import static org.bitrepository.service.audit.AuditDatabaseConstants.AUDITTRAIL_AUDIT;
+import static org.bitrepository.service.audit.AuditDatabaseConstants.AUDIT_TRAIL_AUDIT;
 import static org.bitrepository.service.audit.AuditDatabaseConstants.DATABASE_VERSION_ENTRY;
-import static org.bitrepository.service.audit.AuditDatabaseConstants.FILE_FILEID;
+import static org.bitrepository.service.audit.AuditDatabaseConstants.FILE_FILE_ID;
 import static org.bitrepository.service.audit.AuditDatabaseConstants.FILE_TABLE;
 import static org.testng.Assert.assertEquals;
 
@@ -81,11 +81,11 @@ public void testMigratingAuditContributorDatabase() {
         String extractVersionSql = "SELECT version FROM tableversions WHERE tablename = ?";
         int fileTableVersionBefore = DatabaseUtils.selectIntValue(connector, extractVersionSql, FILE_TABLE);
         assertEquals(fileTableVersionBefore, 1, "File table before migration");
-        int auditTableVersionBefore = DatabaseUtils.selectIntValue(connector, extractVersionSql, AUDITTRAIL_AUDIT);
+        int auditTableVersionBefore = DatabaseUtils.selectIntValue(connector, extractVersionSql, AUDIT_TRAIL_AUDIT);
         assertEquals(auditTableVersionBefore, 1, "Table version before migration");
         
         addStep("Ingest a entry to the database without the collection id", "works only in version 1.");
-        String sqlInsert = "INSERT INTO " + FILE_TABLE + " ( " + FILE_FILEID + " ) VALUES ( ? )";
+        String sqlInsert = "INSERT INTO " + FILE_TABLE + " ( " + FILE_FILE_ID + " ) VALUES ( ? )";
         DatabaseUtils.executeStatement(connector, sqlInsert, FILE_ID);
         
         addStep("Perform migration", "File table has version 2, audit table version 5 and database-version is 5");
@@ -93,7 +93,7 @@ public void testMigratingAuditContributorDatabase() {
         migrator.migrate();
         int fileTableVersionAfter = DatabaseUtils.selectIntValue(connector, extractVersionSql, FILE_TABLE);
         assertEquals(fileTableVersionAfter, 2, "Table version after migration");
-        int auditTableVersionAfter = DatabaseUtils.selectIntValue(connector, extractVersionSql, AUDITTRAIL_AUDIT);
+        int auditTableVersionAfter = DatabaseUtils.selectIntValue(connector, extractVersionSql, AUDIT_TRAIL_AUDIT);
         assertEquals(auditTableVersionAfter, 5, "Table version after migration");
         int dbTableVersionAfter = DatabaseUtils.selectIntValue(connector, extractVersionSql, DATABASE_VERSION_ENTRY);
         assertEquals(dbTableVersionAfter, AuditTrailContributorDatabaseMigrator.CURRENT_VERSION, "Table version after migration");
diff --git a/bitrepository-service/src/test/java/org/bitrepository/service/audit/AuditTrailContributorDatabaseTest.java b/bitrepository-service/src/test/java/org/bitrepository/service/audit/AuditTrailContributorDatabaseTest.java
index d03decba9..f7e905d03 100644
--- a/bitrepository-service/src/test/java/org/bitrepository/service/audit/AuditTrailContributorDatabaseTest.java
+++ b/bitrepository-service/src/test/java/org/bitrepository/service/audit/AuditTrailContributorDatabaseTest.java
@@ -21,11 +21,6 @@
  */
 package org.bitrepository.service.audit;
 
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Locale;
-
 import org.bitrepository.bitrepositoryelements.FileAction;
 import org.bitrepository.common.settings.Settings;
 import org.bitrepository.common.settings.TestSettingsProvider;
@@ -39,6 +34,11 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+
 /** Run audit trail contributor database test using Derby.  Generates jaccept reports. */
 
 public class AuditTrailContributorDatabaseTest extends ExtendedTestCase {
@@ -74,7 +74,7 @@ public void testAuditTrailDatabaseExtraction() throws Exception {
         addDescription("Testing the basic functions of the audit trail database interface.");
         addStep("Setup varibles and the database connection.", "No errors.");
         DatabaseManager dm = new AuditDatabaseManager(databaseSpecifics);
-        AuditTrailContributerDAO daba = new DerbyAuditTrailContributorDAO(dm);
+        AuditTrailContributorDAO daba = new DerbyAuditTrailContributorDAO(dm);
         daba.initialize(settings.getComponentID());
 
         addStep("Populate the database.", "Should be inserted into database.");
@@ -131,7 +131,7 @@ public void testAuditTrailDatabaseExtractionOrder() throws Exception {
         addDescription("Test the order of extraction");
         addStep("Setup variables and database connection", "No errors");
         DatabaseManager dm = new AuditDatabaseManager(databaseSpecifics);
-        AuditTrailContributerDAO daba = new DerbyAuditTrailContributorDAO(dm);
+        AuditTrailContributorDAO daba = new DerbyAuditTrailContributorDAO(dm);
         daba.initialize(settings.getComponentID());
 
         addStep("Populate the database.", "Should be inserted into database.");
@@ -167,7 +167,7 @@ public void testAuditTrailDatabaseExtractionOrder() throws Exception {
     public void contributorDatabaseCorrectTimestampTest() throws ParseException {
         addDescription("Testing the correct ingest and extraction of audittrail dates");
         DatabaseManager dm = new AuditDatabaseManager(databaseSpecifics);
-        AuditTrailContributerDAO daba = new DerbyAuditTrailContributorDAO(dm);
+        AuditTrailContributorDAO daba = new DerbyAuditTrailContributorDAO(dm);
         daba.initialize(settings.getComponentID());
         
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSXXX", Locale.ROOT);
@@ -212,7 +212,7 @@ public void testAuditTrailDatabaseIngest() throws Exception {
         }
 
         DatabaseManager dm = new AuditDatabaseManager(databaseSpecifics);
-        AuditTrailContributerDAO daba = new DerbyAuditTrailContributorDAO(dm);
+        AuditTrailContributorDAO daba = new DerbyAuditTrailContributorDAO(dm);
         daba.initialize(settings.getComponentID());
         
         addStep("Test with all data.", "No failures");
diff --git a/bitrepository-service/src/test/java/org/bitrepository/service/exception/IllegalOperationExceptionTest.java b/bitrepository-service/src/test/java/org/bitrepository/service/exception/IllegalOperationExceptionTest.java
index 4535062cb..111596fe7 100644
--- a/bitrepository-service/src/test/java/org/bitrepository/service/exception/IllegalOperationExceptionTest.java
+++ b/bitrepository-service/src/test/java/org/bitrepository/service/exception/IllegalOperationExceptionTest.java
@@ -21,15 +21,15 @@
  */
 package org.bitrepository.service.exception;
 
+import org.bitrepository.bitrepositoryelements.ResponseCode;
+import org.jaccept.structure.ExtendedTestCase;
+import org.testng.annotations.Test;
+
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertTrue;
 
-import org.bitrepository.bitrepositoryelements.ResponseCode;
-import org.jaccept.structure.ExtendedTestCase;
-import org.testng.annotations.Test;
-
 /**
  * Test that IllegalOperationException behaves as expected.
  */
diff --git a/bitrepository-webclient/src/main/java/org/bitrepository/BasicClient.java b/bitrepository-webclient/src/main/java/org/bitrepository/BasicClient.java
index 1d455ad9c..673511aef 100644
--- a/bitrepository-webclient/src/main/java/org/bitrepository/BasicClient.java
+++ b/bitrepository-webclient/src/main/java/org/bitrepository/BasicClient.java
@@ -21,15 +21,15 @@
  */
 package org.bitrepository;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.bitrepository.common.settings.Settings;
 import org.bitrepository.settings.repositorysettings.Collection;
 import org.bitrepository.settings.repositorysettings.RepositorySettings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class BasicClient {
     private Settings settings;
     private final Logger log = LoggerFactory.getLogger(getClass());
diff --git a/bitrepository-webclient/src/main/java/org/bitrepository/BasicClientFactory.java b/bitrepository-webclient/src/main/java/org/bitrepository/BasicClientFactory.java
index 17fee7ab3..d460c81ec 100644
--- a/bitrepository-webclient/src/main/java/org/bitrepository/BasicClientFactory.java
+++ b/bitrepository-webclient/src/main/java/org/bitrepository/BasicClientFactory.java
@@ -21,13 +21,6 @@
  */
 package org.bitrepository;
 
-import java.io.BufferedReader;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
-import java.util.Properties;
-
 import org.bitrepository.common.settings.Settings;
 import org.bitrepository.common.settings.SettingsProvider;
 import org.bitrepository.common.settings.XMLFileSettingsLoader;
@@ -36,6 +29,13 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.BufferedReader;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+import java.util.Properties;
+
 public class BasicClientFactory {
     private static final Logger log = LoggerFactory.getLogger(BasicClientFactory.class);
     private static BasicClient client;
diff --git a/bitrepository-webclient/src/main/java/org/bitrepository/utils/LogbackConfigLoader.java b/bitrepository-webclient/src/main/java/org/bitrepository/utils/LogbackConfigLoader.java
index bb084fce3..bc37f3742 100644
--- a/bitrepository-webclient/src/main/java/org/bitrepository/utils/LogbackConfigLoader.java
+++ b/bitrepository-webclient/src/main/java/org/bitrepository/utils/LogbackConfigLoader.java
@@ -21,15 +21,14 @@
  */
 package org.bitrepository.utils;
 
-import java.io.File;
-import java.io.IOException;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import ch.qos.logback.classic.LoggerContext;
 import ch.qos.logback.classic.joran.JoranConfigurator;
 import ch.qos.logback.core.joran.spi.JoranException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.io.IOException;
 
 public class LogbackConfigLoader {
     private Logger log = LoggerFactory.getLogger(LogbackConfigLoader.class);
diff --git a/bitrepository-webclient/src/main/java/org/bitrepository/utils/XMLGregorianCalendarConverter.java b/bitrepository-webclient/src/main/java/org/bitrepository/utils/XMLGregorianCalendarConverter.java
index 21417b051..3072dc728 100644
--- a/bitrepository-webclient/src/main/java/org/bitrepository/utils/XMLGregorianCalendarConverter.java
+++ b/bitrepository-webclient/src/main/java/org/bitrepository/utils/XMLGregorianCalendarConverter.java
@@ -21,13 +21,13 @@
  */
 package org.bitrepository.utils;
 
+import javax.xml.datatype.DatatypeConfigurationException;
+import javax.xml.datatype.DatatypeFactory;
+import javax.xml.datatype.XMLGregorianCalendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.Locale;
 import java.util.TimeZone;
-import javax.xml.datatype.DatatypeConfigurationException;
-import javax.xml.datatype.DatatypeFactory;
-import javax.xml.datatype.XMLGregorianCalendar;
 
 /**
  * Utility class for converting between XMLGregorianCalendar and java.util.Date
diff --git a/bitrepository-webclient/src/main/java/org/bitrepository/webservice/Reposervice.java b/bitrepository-webclient/src/main/java/org/bitrepository/webservice/Reposervice.java
index dd5a1fb68..8a7a4d657 100644
--- a/bitrepository-webclient/src/main/java/org/bitrepository/webservice/Reposervice.java
+++ b/bitrepository-webclient/src/main/java/org/bitrepository/webservice/Reposervice.java
@@ -21,26 +21,24 @@
  */
 package org.bitrepository.webservice;
 
-import java.io.IOException;
-import java.io.StringWriter;
-import java.util.List;
-import java.util.stream.Collectors;
-
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.JsonGenerationException;
+import com.fasterxml.jackson.core.JsonGenerator;
 import org.bitrepository.BasicClient;
 import org.bitrepository.BasicClientFactory;
 import org.bitrepository.common.utils.SettingsUtils;
 import org.bitrepository.settings.repositorysettings.Collection;
 import org.bitrepository.settings.repositorysettings.ProtocolSettings;
 
-import com.fasterxml.jackson.core.JsonFactory;
-import com.fasterxml.jackson.core.JsonGenerationException;
-import com.fasterxml.jackson.core.JsonGenerator;
-
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * The class exposes the REST webservices provided by the Bitrepository-webclient using CXF.
diff --git a/bitrepository-webclient/src/main/java/org/bitrepository/webservice/ServiceUrl.java b/bitrepository-webclient/src/main/java/org/bitrepository/webservice/ServiceUrl.java
index 4e738dc79..ee2c18a75 100644
--- a/bitrepository-webclient/src/main/java/org/bitrepository/webservice/ServiceUrl.java
+++ b/bitrepository-webclient/src/main/java/org/bitrepository/webservice/ServiceUrl.java
@@ -21,6 +21,13 @@
  */
 package org.bitrepository.webservice;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
 import java.io.BufferedReader;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -28,14 +35,6 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Properties;
 
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 @Path("/urlservice")
 public class ServiceUrl {
     private static final String CONFIGFILE = "services.properties";
diff --git a/bitrepository-webclient/src/main/java/org/bitrepository/webservice/WebclientContextListener.java b/bitrepository-webclient/src/main/java/org/bitrepository/webservice/WebclientContextListener.java
index 96fbf654e..128674b7e 100644
--- a/bitrepository-webclient/src/main/java/org/bitrepository/webservice/WebclientContextListener.java
+++ b/bitrepository-webclient/src/main/java/org/bitrepository/webservice/WebclientContextListener.java
@@ -21,15 +21,15 @@
  */
 package org.bitrepository.webservice;
 
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-
 import org.bitrepository.BasicClient;
 import org.bitrepository.BasicClientFactory;
 import org.bitrepository.utils.LogbackConfigLoader;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+
 
 /**
  * The Listener has two intentions
diff --git a/bitrepository-webclient/src/main/webapp/WEB-INF/web.xml b/bitrepository-webclient/src/main/webapp/WEB-INF/web.xml
index 8b9ad243f..3954fafe6 100644
--- a/bitrepository-webclient/src/main/webapp/WEB-INF/web.xml
+++ b/bitrepository-webclient/src/main/webapp/WEB-INF/web.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   #%L
-  Bitrepository Webclient
+  BitRepository Webclient
   %%
   Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
   %%