diff --git a/src/YoutubeApi.cpp b/src/YoutubeApi.cpp
index b9328af..c291157 100644
--- a/src/YoutubeApi.cpp
+++ b/src/YoutubeApi.cpp
@@ -1,40 +1,40 @@
 /*
-Copyright (c) 2017 Brian Lough. All right reserved.
+   Copyright (c) 2017 Brian Lough. All right reserved.
 
-YoutubeApi - An Arduino wrapper for the YouTube API
+   YoutubeApi - An Arduino wrapper for the YouTube API
 
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+   Lesser General Public License for more details.
 
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-*/
+   You should have received a copy of the GNU Lesser General Public
+   License along with this library; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
 
 
 #include "YoutubeApi.h"
 
 YoutubeApi::YoutubeApi(String apiKey, Client &client)	{
-  _apiKey = apiKey;
-  this->client = &client;
+	_apiKey = apiKey;
+	this->client = &client;
 }
 
 String YoutubeApi::sendGetToYoutube(String command) {
 	String headers="";
-  String body="";
-  bool finishedHeaders = false;
-  bool currentLineIsBlank = true;
-	long now;
+	String body="";
+	bool finishedHeaders = false;
+	bool currentLineIsBlank = true;
+	unsigned long now;
 	bool avail;
 	// Connect with youtube api over ssl
-	if (client->connect(HOST, SSL_PORT)) {
+	if (client->connect(YTAPI_HOST, YTAPI_SSL_PORT)) {
 		// Serial.println(".... connected to server");
 		String a="";
 		char c;
@@ -42,31 +42,31 @@ String YoutubeApi::sendGetToYoutube(String command) {
 		client->println("GET "+command+"&key="+_apiKey);
 		now=millis();
 		avail=false;
-		while (millis()-now<1500) {
+		while (millis() - now < YTAPI_TIMEOUT) {
 			while (client->available()) {
 				char c = client->read();
 				//Serial.write(c);
 
-        if(!finishedHeaders){
-          if (currentLineIsBlank && c == '\n') {
-            finishedHeaders = true;
-          }
-          else{
-            headers = headers + c;
-
-          }
-        } else {
-          if (ch_count < maxMessageLength)  {
-            body=body+c;
-            ch_count++;
-  				}
-        }
-
-        if (c == '\n') {
-          currentLineIsBlank = true;
-        }else if (c != '\r') {
-          currentLineIsBlank = false;
-        }
+				if(!finishedHeaders){
+					if (currentLineIsBlank && c == '\n') {
+						finishedHeaders = true;
+					}
+					else{
+						headers = headers + c;
+
+					}
+				} else {
+					if (ch_count < maxMessageLength)  {
+						body=body+c;
+						ch_count++;
+					}
+				}
+
+				if (c == '\n') {
+					currentLineIsBlank = true;
+				}else if (c != '\r') {
+					currentLineIsBlank = false;
+				}
 
 				avail=true;
 			}
@@ -79,34 +79,31 @@ String YoutubeApi::sendGetToYoutube(String command) {
 		}
 	}
 
-  //int lastCharIndex = body.lastIndexOf("}");
-
-	//return body.substring(0,lastCharIndex+1);
-  return body;
+	return body;
 }
 
 bool YoutubeApi::getChannelStatistics(String channelId){
-  String command="https://www.googleapis.com/youtube/v3/channels?part=statistics&id="+channelId; //If you can't find it(for example if you have a custom url) look here: https://www.youtube.com/account_advanced
-  String response = sendGetToYoutube(command);       //recieve reply from youtube
-  DynamicJsonBuffer jsonBuffer;
-  JsonObject& root = jsonBuffer.parseObject(response);
-  if(root.success()) {
-    if (root.containsKey("items")) {
-      long subscriberCount = root["items"][0]["statistics"]["subscriberCount"];
-      long viewCount = root["items"][0]["statistics"]["viewCount"];
-      long commentCount = root["items"][0]["statistics"]["commentCount"];
-      long hiddenSubscriberCount = root["items"][0]["statistics"]["hiddenSubscriberCount"];
-      long videoCount = root["items"][0]["statistics"]["videoCount"];
-
-      channelStats.viewCount = viewCount;
-      channelStats.subscriberCount = subscriberCount;
-      channelStats.commentCount = commentCount;
-      channelStats.hiddenSubscriberCount = hiddenSubscriberCount;
-      channelStats.videoCount = videoCount;
-
-      return true;
-    }
-  }
-
-  return false;
+	String command="https://" YTAPI_HOST "/youtube/v3/channels?part=statistics&id="+channelId; //If you can't find it(for example if you have a custom url) look here: https://www.youtube.com/account_advanced
+	String response = sendGetToYoutube(command);       //recieve reply from youtube
+	DynamicJsonBuffer jsonBuffer;
+	JsonObject& root = jsonBuffer.parseObject(response);
+	if(root.success()) {
+		if (root.containsKey("items")) {
+			long subscriberCount = root["items"][0]["statistics"]["subscriberCount"];
+			long viewCount = root["items"][0]["statistics"]["viewCount"];
+			long commentCount = root["items"][0]["statistics"]["commentCount"];
+			long hiddenSubscriberCount = root["items"][0]["statistics"]["hiddenSubscriberCount"];
+			long videoCount = root["items"][0]["statistics"]["videoCount"];
+
+			channelStats.viewCount = viewCount;
+			channelStats.subscriberCount = subscriberCount;
+			channelStats.commentCount = commentCount;
+			channelStats.hiddenSubscriberCount = hiddenSubscriberCount;
+			channelStats.videoCount = videoCount;
+
+			return true;
+		}
+	}
+
+	return false;
 }
diff --git a/src/YoutubeApi.h b/src/YoutubeApi.h
index dfea1cf..207e5e2 100644
--- a/src/YoutubeApi.h
+++ b/src/YoutubeApi.h
@@ -26,11 +26,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 #include <ArduinoJson.h>
 #include <Client.h>
 
-#define HOST "www.googleapis.com"
-#define SSL_PORT 443
-#define HANDLE_MESSAGES 1
-#define MAX_BUFFER_SIZE 1250
-
+#define YTAPI_HOST "www.googleapis.com"
+#define YTAPI_SSL_PORT 443
+#define YTAPI_TIMEOUT 1500
 
 
 struct channelStatistics{