diff --git a/mock/src/main/java/seng302/App.java b/mock/src/main/java/seng302/App.java
index 74e20255..3828085b 100644
--- a/mock/src/main/java/seng302/App.java
+++ b/mock/src/main/java/seng302/App.java
@@ -4,7 +4,11 @@ package seng302;
 import javafx.application.Application;
 import javafx.stage.Stage;
 import org.xml.sax.SAXException;
-import seng302.DataInput.*;
+import seng302.DataInput.PolarParser;
+import seng302.DataInput.RaceDataSource;
+import seng302.DataInput.RaceXMLReader;
+import seng302.DataInput.RegattaDataSource;
+import seng302.DataInput.RegattaXMLReader;
 import seng302.Exceptions.InvalidPolarFileException;
 import seng302.Model.Event;
 import seng302.Model.Polars;
diff --git a/mock/src/main/java/seng302/DataInput/RaceDataSource.java b/mock/src/main/java/seng302/DataInput/RaceDataSource.java
index 290fba5a..391c80f9 100644
--- a/mock/src/main/java/seng302/DataInput/RaceDataSource.java
+++ b/mock/src/main/java/seng302/DataInput/RaceDataSource.java
@@ -1,6 +1,5 @@
 package seng302.DataInput;
 
-;
 import seng302.Model.Boat;
 import seng302.Model.GPSCoordinate;
 import seng302.Model.Leg;
diff --git a/mock/src/main/java/seng302/DataInput/RaceXMLReader.java b/mock/src/main/java/seng302/DataInput/RaceXMLReader.java
index af1d7d89..2efbf0e4 100644
--- a/mock/src/main/java/seng302/DataInput/RaceXMLReader.java
+++ b/mock/src/main/java/seng302/DataInput/RaceXMLReader.java
@@ -5,6 +5,7 @@ import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 import org.xml.sax.SAXException;
 
+import seng302.Model.GPSCoordinate;
 import seng302.Model.*;
 
 import javax.xml.parsers.ParserConfigurationException;
diff --git a/mock/src/main/java/seng302/Model/Boat.java b/mock/src/main/java/seng302/Model/Boat.java
index 9604680a..5a85a0d4 100644
--- a/mock/src/main/java/seng302/Model/Boat.java
+++ b/mock/src/main/java/seng302/Model/Boat.java
@@ -2,8 +2,6 @@ package seng302.Model;
 
 import org.geotools.referencing.GeodeticCalculator;
 
-import java.util.ArrayList;
-
 
 /**
  * Created by esa46 on 1/05/17.
diff --git a/mock/src/main/java/seng302/Model/Marker.java b/mock/src/main/java/seng302/Model/Marker.java
index a5854449..07e11637 100644
--- a/mock/src/main/java/seng302/Model/Marker.java
+++ b/mock/src/main/java/seng302/Model/Marker.java
@@ -1,6 +1,7 @@
 package seng302.Model;
 
 import org.geotools.referencing.GeodeticCalculator;
+
 import java.awt.geom.Point2D;
 
 /**