diff --git a/app/src/main/java/org/traccar/client/PositionProvider.java b/app/src/main/java/org/traccar/client/PositionProvider.java
index ecee22b..20b2f0a 100644
--- a/app/src/main/java/org/traccar/client/PositionProvider.java
+++ b/app/src/main/java/org/traccar/client/PositionProvider.java
@@ -47,7 +47,7 @@ public class PositionProvider {
     private boolean useFine;
     private boolean useCoarse;
 
-    public PositionProvider(Context context, String type, long period, String id, PositionListener listener) {
+    public PositionProvider(Context context, PositionListener listener, String id, String type, long period) {
         handler = new Handler(context.getMainLooper());
         locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
         this.period = period;
diff --git a/app/src/main/java/org/traccar/client/TrackingService.java b/app/src/main/java/org/traccar/client/TrackingService.java
index 9962619..85cf112 100644
--- a/app/src/main/java/org/traccar/client/TrackingService.java
+++ b/app/src/main/java/org/traccar/client/TrackingService.java
@@ -15,32 +15,17 @@
  */
 package org.traccar.client;
 
-import android.annotation.TargetApi;
 import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
-import android.content.IntentFilter;
 import android.content.SharedPreferences;
-import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
-import android.location.Location;
-import android.os.BatteryManager;
-import android.os.Build;
 import android.os.IBinder;
 import android.os.PowerManager;
 import android.os.PowerManager.WakeLock;
 import android.preference.PreferenceManager;
-import android.util.Log;
 
 public class TrackingService extends Service implements PositionProvider.PositionListener {
 
-    public static final String LOG_TAG = "Traccar.TrackingService";
-
-    private String id;
-    private String address;
-    private int port;
-    private int interval;
-    private String provider;
-
     private ClientController clientController;
     private PositionProvider positionProvider;
     
@@ -56,20 +41,17 @@ public class TrackingService extends Service implements PositionProvider.Positio
 
         SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
 
-        try {
-            id = sharedPreferences.getString(MainActivity.KEY_ID, null);
-            address = sharedPreferences.getString(MainActivity.KEY_ADDRESS, null);
-            provider = sharedPreferences.getString(MainActivity.KEY_PROVIDER, null);
-            port = Integer.valueOf(sharedPreferences.getString(MainActivity.KEY_PORT, null));
-            interval = Integer.valueOf(sharedPreferences.getString(MainActivity.KEY_INTERVAL, null));
-        } catch (Exception error) {
-            Log.w(LOG_TAG, error);
-        }
+        String id = sharedPreferences.getString(MainActivity.KEY_ID, null);
 
-        clientController = new ClientController(this, address, port, ProtocolFormatter.createLoginMessage(id));
+        clientController = new ClientController(this,
+                sharedPreferences.getString(MainActivity.KEY_ADDRESS, null),
+                Integer.parseInt(sharedPreferences.getString(MainActivity.KEY_PORT, null)),
+                ProtocolFormatter.createLoginMessage(id));
         clientController.start();
 
-        positionProvider = new PositionProvider(this, provider, interval * 1000, id, this);
+        positionProvider = new PositionProvider(this, this, id,
+                sharedPreferences.getString(MainActivity.KEY_PROVIDER, null),
+                Integer.parseInt(sharedPreferences.getString(MainActivity.KEY_INTERVAL, null)) * 1000);
         positionProvider.startUpdates();
     }