+//=====for Keen Integration====================
 #include "ApiClient.h"
+#include "KeenClient.h"
+KeenClient myKeen;
+
+//=====for writting to the console=============
 #include "Bridge.h"
 #include "Console.h"
+
+//=====for Probe Thermometer===================
+#include "OneWire.h"
+const byte probePin = 3;
+OneWire myPT(probePin);
+
+typedef struct my_soilmeasurement {
+  float tempSoilC;
+  float tempSoilF;  
+} SoilMeasurement;
+SoilMeasurement sm;
+
+//=====for Digital Thermo, Humidity Sensor=====
 #include "DHT.h"
-#include "KeenClient.h"
-#include "OneWire.h"
-#include "params.h"
-
-// hardware
-int lightPin = 0; // photoresistor
-int hygroPin = 1; // moisture sensor
-int dhtPin = 2;   // dht11
-int probePin = 3; // temp probe
-
-DHT dht(dhtPin, DHT11);
-OneWire ds(probePin);
-KeenClient keen;
-
-// todo make this array (of error codes)
-//boolean error;
+const byte dhtPin = 2;
+DHT myDHT(dhtPin, DHT11);
 
 typedef struct my_airmeasurement {
-  int humidityAir;
-  int tempAirC;
-  int tempAirF;
-  int heatIndex;
+  float humidityAir;
+  float tempAirC;
+  float tempAirF;
+  float heatIndex;
 } AirMeasurement;
 AirMeasurement am;
 
-typedef struct my_soilmeasurement {
-  int tempSoilC;
-  int tempSoilF;  
-} SoilMeasurement;
-SoilMeasurement sm;
-
+//=====for keys, params========================
+#include "params.h"
+
+//=====for photoresistor=======================
+const byte lightPin = 0;
 int lightResistor;
+
+//=====for hygrometer==========================
+const byte hygroPin = 1;
 int moistureSensor;
 
+//=====these i am still thinking about=========
 String appId = "Plant01";
 String location = "Dinning Room Window";
 boolean lightStatus = false;

  byte data[12];
  byte addr[8];

  if ( !ds.search(addr)) {
      //no more sensors on chain, reset search
      ds.reset_search();
      Serial.println("No probe sensor detected");
      Console.println("No probe sensor detected");
  }

  my_output += am.heatIndex;
  my_output += ";Light:";
  my_output += lightResistor;
  my_output += ";ProbeTemperatureCelcius:";
  my_output += sm.tempSoilC;
  my_output += ";ProbeTemperatureFahrenheit:";
  my_output += sm.tempSoilF;
