diff --git a/ch.psi.cdump/Readme.md b/ch.psi.cdump/Readme.md
index 5667c2b..8d80de0 100644
--- a/ch.psi.cdump/Readme.md
+++ b/ch.psi.cdump/Readme.md
@@ -2,11 +2,12 @@
 Cdump enables users to record data via an ADC in a continuous way. Cdump requires a special IOC based configuration.
 
 # Usage
-To start cdump use `bin/cdump` executable.
+To start the cdump client use the provided `bin/cdump` executable.
 
 Usage:
 
 ```
+bin/cdump
 Usage: cdump <samplingRate> <datafilename>
 Supported rates: 1Hz 2Hz 5Hz 10Hz 20Hz 50Hz 100Hz 200Hz 500Hz 1kHz 2kHz 5kHz 10kHz 20kHz 50kHz 100kHz
 ```
diff --git a/ch.psi.cdump/src/main/java/ch/psi/cdump/CdumpService.java b/ch.psi.cdump/src/main/java/ch/psi/cdump/CdumpService.java
index ef47a84..9faf064 100644
--- a/ch.psi.cdump/src/main/java/ch/psi/cdump/CdumpService.java
+++ b/ch.psi.cdump/src/main/java/ch/psi/cdump/CdumpService.java
@@ -36,8 +36,6 @@ public class CdumpService {
 
 	public final static String APP_HOME = "ch.psi.cdump.home";
 	
-	
-	// Get Logger
 	private static final Logger logger = Logger.getLogger(CdumpService.class.getName());
 	
 	private CdumpAqLogic aqlogic = null;
@@ -54,9 +52,6 @@ public class CdumpService {
 		this.cservice = cservice;
 	}
 	
-	/**
-	 * @param args
-	 */
 	public void startAcquisition(RunConfiguration c) {
 		eventbus = new AsyncEventBus(Executors.newCachedThreadPool());
 		
diff --git a/ch.psi.cdump/src/main/java/ch/psi/cdump/RunConfiguration.java b/ch.psi.cdump/src/main/java/ch/psi/cdump/RunConfiguration.java
index b524910..3195dc9 100644
--- a/ch.psi.cdump/src/main/java/ch/psi/cdump/RunConfiguration.java
+++ b/ch.psi.cdump/src/main/java/ch/psi/cdump/RunConfiguration.java
@@ -85,39 +85,19 @@ public class RunConfiguration {
 		}
 	}
 
-	/**
-	 * @return the samplingRate
-	 */
 	public int getSamplingRate() {
 		return samplingRate;
 	}
-
-	/**
-	 * @return the executionTime
-	 */
 	public Long getExecutionTime() {
 		return executionTime;
 	}
-
-	/**
-	 * @param executionTime the executionTime to set
-	 */
 	public void setExecutionTime(Long executionTime) {
 		this.executionTime = executionTime;
 	}
-
-	/**
-	 * @param datafile the datafile to set
-	 */
 	public void setDatafile(File datafile) {
 		this.datafile = datafile;
 	}
-
-	/**
-	 * @return the datafile
-	 */
 	public File getDatafile() {
 		return datafile;
 	}
-	
 }
diff --git a/ch.psi.cdump/src/main/java/ch/psi/cdump/ui/CalibratePanel.java b/ch.psi.cdump/src/main/java/ch/psi/cdump/ui/CalibratePanel.java
index bef1f25..a667317 100644
--- a/ch.psi.cdump/src/main/java/ch/psi/cdump/ui/CalibratePanel.java
+++ b/ch.psi.cdump/src/main/java/ch/psi/cdump/ui/CalibratePanel.java
@@ -30,6 +30,8 @@ import javax.swing.ImageIcon;
  */
 public class CalibratePanel extends JPanel {
 
+	private static final long serialVersionUID = 1L;
+
 	/**
 	 * Create the panel.
 	 */
diff --git a/ch.psi.cdump/src/main/java/ch/psi/cdump/ui/ControlPanel.java b/ch.psi.cdump/src/main/java/ch/psi/cdump/ui/ControlPanel.java
index a0311a1..a861ccd 100644
--- a/ch.psi.cdump/src/main/java/ch/psi/cdump/ui/ControlPanel.java
+++ b/ch.psi.cdump/src/main/java/ch/psi/cdump/ui/ControlPanel.java
@@ -40,9 +40,11 @@ import java.awt.event.ActionEvent;
  *
  */
 public class ControlPanel extends JPanel {
+	private static final long serialVersionUID = 1L;
+	
 	private JTextField tfScanName;
 	private JButton btnCalibrate;
-	private JComboBox cbSamplingRate;
+	private JComboBox<?> cbSamplingRate;
 	private JButton btnAcquire;
 	private JLabel lblRunning;
 	private JTextField tfMonoFrequency;
@@ -62,7 +64,7 @@ public class ControlPanel extends JPanel {
 		
 		JLabel lblFrequency = new JLabel("frequency");
 		
-		cbSamplingRate = new JComboBox();
+		cbSamplingRate = new JComboBox<>();
 		
 		lblSamplingRate = new JLabel("Sampling Rate");