diff --git a/src/main/java/ch/hepia/ui/MainWindowController.java b/src/main/java/ch/hepia/ui/MainWindowController.java
index bc66249145739ef724275ba1e88fbf0c5daa50b2..8dfdd6080d77fddb55d36639968d53e161ef9ed0 100644
--- a/src/main/java/ch/hepia/ui/MainWindowController.java
+++ b/src/main/java/ch/hepia/ui/MainWindowController.java
@@ -26,11 +26,9 @@ import javafx.scene.paint.CycleMethod;
 import javafx.scene.paint.LinearGradient;
 import javafx.scene.paint.Stop;
 import javafx.util.Duration;
-import org.json.JSONArray;
 
 import java.io.IOException;
 import java.net.URL;
-import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.ResourceBundle;
@@ -88,11 +86,9 @@ public class MainWindowController implements Initializable {
     private void searchStops(String newValue, LinkAPI transportApi, ComboBox<String> target){
         if (!newValue.isEmpty() && newValue.length() > 3 && !target.getItems().contains(newValue)){
             try {
-                List<Location> l = transportApi.getStations(newValue);
+                List<Location> locations = transportApi.getStations(newValue);
                 ArrayList<String> results = new ArrayList<>();
-                for (int i = 0; i < l.size(); i++){
-                    results.add(l.get(i).getName());
-                }
+                locations.forEach((location) -> results.add(location.getName()));
                 target.getItems().clear();
                 target.getItems().addAll(results);
                 target.show();
@@ -294,7 +290,6 @@ public class MainWindowController implements Initializable {
                 startStopLabel.setText(originComboBox.getValue() + " - " + destinationComboBox.getValue());
                 for (int i = 0; i < connections.size(); i++){
                     // Now iterating over connections
-                    // Connection c = new Connection.ConnectionBuilder(connections.getJSONObject(i)).build();
                     drawConnection(connections.get(i), 30, 100 + 100 * i);
                 }
             } catch (IOException e) {