diff --git a/src/server/server.java b/src/server/server.java
index fa0c424..691b40e 100644
--- a/src/server/server.java
+++ b/src/server/server.java
@@ -127,7 +127,6 @@ public void run() {
 									// Outputs the current temperature to the console and writes to disk
 									System.out.printf("The current temperature is: %d \n", currentTemperature);
 									String currentTempString = Integer.toString(currentTemperature);
-									//this.setCurrentTempForSerialNumber();
 								} finally {
 									socket.close();
 								}
diff --git a/src/thermostat/ThermostatDevice.java b/src/thermostat/ThermostatDevice.java
index 2403a72..e35a21d 100644
--- a/src/thermostat/ThermostatDevice.java
+++ b/src/thermostat/ThermostatDevice.java
@@ -103,7 +103,7 @@ public void sendCurrentTemp(String currentTemp, String serverIP) throws IOExcept
 		        // Instantiate a printwriter so we can write to the output stream
 		        PrintWriter out = new PrintWriter(sender.getOutputStream(), true);
 		        // Send out the value of currentTemperature
-		        int currentTempInt = Integer.parseInt(currentTemp);
+		        int currentTempInt = Integer.valueOf(currentTemp).intValue();
 		        out.println(currentTempInt);
 		      }
 		    } finally {