diff --git a/simpleexample/src/main/java/simpleex/core/LatLong.java b/simpleexample/src/main/java/simpleex/core/LatLong.java
index 438f188802868f2bf4200941e8dfff80b8e4ddeb..68d10a1f3614a1eb6e74cdd4ef5383f46e84aec7 100644
--- a/simpleexample/src/main/java/simpleex/core/LatLong.java
+++ b/simpleexample/src/main/java/simpleex/core/LatLong.java
@@ -13,7 +13,6 @@ public class LatLong {
     this.longitude = longitude;
   }
 
-
   public double getLatitude() {
     return latitude;
   }
diff --git a/simpleexample/src/main/java/simpleex/ui/FxAppController.java b/simpleexample/src/main/java/simpleex/ui/FxAppController.java
index 134d375d09565cb21becb6fe55da4109fae3d047..c0044403e211629f96e00db954afcaad010dce8e 100644
--- a/simpleexample/src/main/java/simpleex/ui/FxAppController.java
+++ b/simpleexample/src/main/java/simpleex/ui/FxAppController.java
@@ -12,7 +12,6 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.util.Optional;
 import javafx.collections.FXCollections;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
@@ -73,7 +72,7 @@ public class FxAppController {
   private MapBase mapView;
 
   private MapItemsControl<MapNode> markersParent;
-  private Optional<MapMarker> marker = Optional.empty();
+  private MapMarker marker = null;
   private DraggableNodeController draggableMapController = null;
   private DraggableNodeController draggableMarkerController = null;
 
@@ -107,7 +106,7 @@ public class FxAppController {
 
   private void handleMarkerDragged(final Node node, final double dx, final double dy) {
     final MapProjection projection = mapView.getProjection();
-    final Point2D point = projection.locationToViewportPoint(marker.get().getLocation());
+    final Point2D point = projection.locationToViewportPoint(marker.getLocation());
     final Location newLocation = projection.viewportPointToLocation(point.add(dx, dy));
     getLatLongs().setLatLong(locationListView.getSelectionModel().getSelectedIndex(),
         location2LatLong(newLocation));
@@ -123,23 +122,22 @@ public class FxAppController {
     if (num < 0 || num >= getLatLongs().getLatLongCount()) {
       markersParent.getItems().clear();
       if (draggableMarkerController != null) {
-        draggableMarkerController.detach(marker.get());
+        draggableMarkerController.detach(marker);
       }
-      marker = Optional.empty();
+      marker = null;
     } else {
       final LatLong latLong = getLatLongs().getLatLong(num);
-      if (marker.isEmpty()) {
-        final MapMarker aMarker = new MapMarker(latLong);
-        markersParent.getItems().add(aMarker);
+      if (marker == null) {
+        marker = new MapMarker(latLong);
+        markersParent.getItems().add(marker);
         if (draggableMarkerController != null) {
-          draggableMarkerController.attach(aMarker);
+          draggableMarkerController.attach(marker);
         }
-        marker = Optional.of(aMarker);
       } else {
-        marker.get().setLocation(latLong);
+        marker.setLocation(latLong);
       }
       if (centerOnMarker) {
-        mapView.setCenter(marker.get().getLocation());
+        mapView.setCenter(marker.getLocation());
       }
     }
   }