diff --git a/src/main/java/seng302/gameServer/GameState.java b/src/main/java/seng302/gameServer/GameState.java
index 304fea55..4694d7d4 100644
--- a/src/main/java/seng302/gameServer/GameState.java
+++ b/src/main/java/seng302/gameServer/GameState.java
@@ -1,12 +1,9 @@
 package seng302.gameServer;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
+
 import seng302.models.Player;
 
-import java.util.ArrayList;
 import seng302.models.Yacht;
 import seng302.server.messages.BoatActionType;
 
@@ -29,11 +26,11 @@ public class GameState {
     public GameState(String hostIpAddress) {
         GameState.hostIpAddress = hostIpAddress;
         players = new ArrayList<>();
-        yachts = new HashMap<>();
         currentStage = GameStages.LOBBYING;
         isRaceStarted = false;
         //set this when game stage changes to prerace
         previousUpdateTime = System.currentTimeMillis();
+        yachts = new HashMap<>();
     }
 
     public static String getHostIpAddress() {