 }
 
 void loop() {
-  Serial.print("{ \"computer\": { ");
+  Serial.print("{");
+
   read_voltages();
+
   Serial.print(",");
-  read_temperature();
-  Serial.println("} }");
+
+  read_dht_temp();
+  read_ds18b20_temp();
+
+  Serial.println("}");
 
   // Blink lights
   blink_led();
 }
 
-void blink_led() {
-  led_value = ! led_value;
-  digitalWrite(led_pin, led_value);
-  delay(1000);
-}
-
-void toggle_fan() {
-  // Turn Fan On
-  if (digitalRead(fan_pin) == 'HIGH') {
-    digitalWrite(fan_pin, LOW);
-  } else {
-    digitalWrite(fan_pin, HIGH);
-  }
-}
-
-/*
-
-DC Probe: ~730 = 11.53
-
-*/
+
+/* DC Probe: ~730 = 11.53 */
 void read_voltages() {
   int ac_reading = analogRead(ac_probe);
   float ac_voltage = ac_reading / 1023 * 5;


//// Reading temperature or humidity takes about 250 milliseconds!
//// Sensor readings may also be up to 2 seconds 'old' (its a very slow sensor)
void read_temperature() {
  float h = dht.readHumidity();
  float c = dht.readTemperature(); // Celsius


    Serial.print("\":");
    Serial.print(get_temperature(sensors_address[x]));

    // Append a comma to all but last
    if (x < num_ds18 - 1) {
      Serial.print(",");
    }
  }
}

/*
