diff --git a/src/main/java/App.java b/src/main/java/App.java
index 5f79795..09c056f 100644
--- a/src/main/java/App.java
+++ b/src/main/java/App.java
@@ -1,17 +1,18 @@
 import java.io.File;
-import java.nio.file.Files;
 import java.io.IOException;
-import java.nio.file.Paths;
 import java.nio.charset.StandardCharsets;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.apache.commons.cli.Options;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.CommandLineParser;
-import org.apache.commons.cli.ParseException;
 import org.apache.commons.cli.DefaultParser;
-import org.apache.commons.cli.Option;
 import org.apache.commons.cli.HelpFormatter;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.ParseException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * App is the entry point for the application.
diff --git a/src/main/java/CSVReader.java b/src/main/java/CSVReader.java
index b98039b..d411f7f 100644
--- a/src/main/java/CSVReader.java
+++ b/src/main/java/CSVReader.java
@@ -1,12 +1,13 @@
 import java.io.File;
 import java.io.IOException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.fasterxml.jackson.datatype.joda.JodaModule;
-import com.espertech.esper.client.EPServiceProvider;
+
 import com.fasterxml.jackson.databind.MappingIterator;
 import com.fasterxml.jackson.dataformat.csv.CsvMapper;
 import com.fasterxml.jackson.dataformat.csv.CsvSchema;
+import com.fasterxml.jackson.datatype.joda.JodaModule;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 public class CSVReader implements TickStreamReader {
diff --git a/src/main/java/EsperProcessor.java b/src/main/java/EsperProcessor.java
index 86282d9..9b26001 100644
--- a/src/main/java/EsperProcessor.java
+++ b/src/main/java/EsperProcessor.java
@@ -1,25 +1,21 @@
-import ats.plugin.OHLCPlugInViewFactory;
-import ats.plugin.OHLCUpdateListener;
-import ats.plugin.OHLCEvent;
-import ats.plugin.OHLCValueEvent;
+import java.util.Arrays;
+import java.util.stream.Collectors;
+
 import com.espertech.esper.client.Configuration;
 import com.espertech.esper.client.EPServiceProvider;
 import com.espertech.esper.client.EPServiceProviderManager;
 import com.espertech.esper.client.EPStatement;
-import com.espertech.esper.client.EventBean;
 import com.espertech.esper.client.StatementAwareUpdateListener;
 import com.espertech.esper.client.UpdateListener;
 import com.espertech.esper.client.time.CurrentTimeEvent;
-import java.io.File;
-import java.lang.reflect.Array;
-import java.math.BigDecimal;
-import java.util.Arrays;
-import java.util.Map;
-import java.util.stream.Collectors;
-import org.joda.time.DateTime;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import ats.plugin.OHLCEvent;
+import ats.plugin.OHLCPlugInViewFactory;
+import ats.plugin.OHLCValueEvent;
+
 
 public class EsperProcessor implements TickProcessor {
     final Logger log = LoggerFactory.getLogger(EsperProcessor.class);
diff --git a/src/main/java/OANDAReader.java b/src/main/java/OANDAReader.java
index de4313b..e486b78 100644
--- a/src/main/java/OANDAReader.java
+++ b/src/main/java/OANDAReader.java
@@ -2,21 +2,20 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.UnsupportedEncodingException;
-import java.net.MalformedURLException;
-import java.net.SocketTimeoutException;
 import java.net.URL;
 import java.net.URLConnection;
 import java.net.URLEncoder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.fasterxml.jackson.datatype.joda.JodaModule;
-import com.espertech.esper.client.time.CurrentTimeEvent;
 
 import javax.net.ssl.HttpsURLConnection;
 
+import com.espertech.esper.client.time.CurrentTimeEvent;
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.datatype.joda.JodaModule;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 public class OANDAReader implements TickStreamReader {
diff --git a/src/main/java/TrueFXTickEvent.java b/src/main/java/TrueFXTickEvent.java
index ae1ef48..eafed06 100644
--- a/src/main/java/TrueFXTickEvent.java
+++ b/src/main/java/TrueFXTickEvent.java
@@ -1,7 +1,8 @@
 import java.math.BigDecimal;
-import java.util.Date;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
 import org.joda.time.DateTime;
 
 /**