diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d598e07..49ec164 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,7 +5,7 @@
       <GradleProjectSettings>
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-3.5" />
+        <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-4.1-rc-1" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 6653418..5489fee 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
-  </component>
   <component name="NullableNotNullManager">
     <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
@@ -27,17 +24,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/src/main/java/com/kwabenaberko/openweathermap/MainActivity.java b/app/src/main/java/com/kwabenaberko/openweathermap/MainActivity.java
index ae52167..bcdad0e 100644
--- a/app/src/main/java/com/kwabenaberko/openweathermap/MainActivity.java
+++ b/app/src/main/java/com/kwabenaberko/openweathermap/MainActivity.java
@@ -1,13 +1,12 @@
 package com.kwabenaberko.openweathermap;
 
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 
 import com.kwabenaberko.openweathermaplib.Units;
 import com.kwabenaberko.openweathermaplib.implementation.OpenWeatherMapHelper;
 import com.kwabenaberko.openweathermaplib.models.currentweather.CurrentWeather;
-import com.kwabenaberko.openweathermaplib.models.threehourforecast.ThreeHourForecast;
 
 public class MainActivity extends AppCompatActivity {
 
diff --git a/openweathermaphelper/src/main/java/com/kwabenaberko/openweathermaplib/Units.java b/openweathermaphelper/src/main/java/com/kwabenaberko/openweathermaplib/Units.java
index cd14186..0b5c118 100644
--- a/openweathermaphelper/src/main/java/com/kwabenaberko/openweathermaplib/Units.java
+++ b/openweathermaphelper/src/main/java/com/kwabenaberko/openweathermaplib/Units.java
@@ -6,5 +6,5 @@
 
 public class Units {
     public static final String IMPERIAL = "imperial";
-    public static final String FAHRENHEIT = "fahrenheit";
+    public static final String METRIC = "metric";
 }
diff --git a/openweathermaphelper/src/main/java/com/kwabenaberko/openweathermaplib/implementation/OpenWeatherMapHelper.java b/openweathermaphelper/src/main/java/com/kwabenaberko/openweathermaplib/implementation/OpenWeatherMapHelper.java
index cf537fe..769cc71 100644
--- a/openweathermaphelper/src/main/java/com/kwabenaberko/openweathermaplib/implementation/OpenWeatherMapHelper.java
+++ b/openweathermaphelper/src/main/java/com/kwabenaberko/openweathermaplib/implementation/OpenWeatherMapHelper.java
@@ -1,13 +1,11 @@
 package com.kwabenaberko.openweathermaplib.implementation;
 
-import android.inputmethodservice.AbstractInputMethodService;
 import android.support.annotation.NonNull;
 
-import com.kwabenaberko.openweathermaplib.Units;
+import com.kwabenaberko.openweathermaplib.models.currentweather.CurrentWeather;
 import com.kwabenaberko.openweathermaplib.models.threehourforecast.ThreeHourForecast;
 import com.kwabenaberko.openweathermaplib.network.OpenWeatherMapClient;
 import com.kwabenaberko.openweathermaplib.network.OpenWeatherMapService;
-import com.kwabenaberko.openweathermaplib.models.currentweather.CurrentWeather;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -44,7 +42,6 @@ public OpenWeatherMapHelper(){
         openWeatherMapService = OpenWeatherMapClient.getClient().create(OpenWeatherMapService.class);
         options = new HashMap<>();
         options.put("APPID", "");
-        options.put("units", Units.FAHRENHEIT);
     }
 
     //METHODS TO SETUP APPLICATION