diff --git a/.eslintrc.json b/.eslintrc.json
index 9a7885c..196e8d8 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -11,7 +11,7 @@
         "indent": [
             2,
             2,
-            {"SwitchCase": 1}
+            {"SwitchCase": 1, "VariableDeclarator": {"const": 3, "let": 2}}
         ],
         "linebreak-style": [
             "error",
diff --git a/client/graph-api.js b/client/graph-api.js
index 9ceac9a..fc12cc8 100644
--- a/client/graph-api.js
+++ b/client/graph-api.js
@@ -1,5 +1,5 @@
 const request = require('request'),
-  fs = require('fs');
+      fs = require('fs');
 
 function GraphRequest(options) {  
 
@@ -85,11 +85,11 @@ function formatApiVersion (version) {
 function sendGraphRequest (options) {
 
   const api_version = options.api_version || this.getApiVersion(),
-    qs = options.qs || {},
-    request_options = {
-      uri: 'https://graph.facebook.com',
-      qs: qs
-    };
+        qs = options.qs || {},
+        request_options = {
+          uri: 'https://graph.facebook.com',
+          qs: qs
+        };
 
   return new Promise((resolve, reject) => {
     if (!options.path) {
diff --git a/client/index.js b/client/index.js
index 5987dfd..60d0adf 100644
--- a/client/index.js
+++ b/client/index.js
@@ -1,10 +1,10 @@
 const GraphRequest = require('./graph-api'),
-  Messages = require('./messages'),
-  MessengerProfile = require('./messenger-profile'),
-  Person = require('./person'),
-  MessengerCode = require('./messenger-codes'),
-  MessagingInsights = require('./messaging-insights'),
-  Attachment = require('./attachment-upload');      
+      Messages = require('./messages'),
+      MessengerProfile = require('./messenger-profile'),
+      Person = require('./person'),
+      MessengerCode = require('./messenger-codes'),
+      MessagingInsights = require('./messaging-insights'),
+      Attachment = require('./attachment-upload');      
 
 /**
  * Creates an instance of `Client`, used for sending requests to the Messenger Platform APIs.
diff --git a/client/messages/index.js b/client/messages/index.js
index c8b60f3..bbd5ad2 100644
--- a/client/messages/index.js
+++ b/client/messages/index.js
@@ -1,8 +1,8 @@
 const Broadcast = require('./broadcast'),
-  SendApi = require('./send-api'),
-  MessageCreative = require('./message-creative'),
-  CustomLabels = require('./custom-labels'),
-  SponsoredMessage = require('./sponsored-message');
+      SendApi = require('./send-api'),
+      MessageCreative = require('./message-creative'),
+      CustomLabels = require('./custom-labels'),
+      SponsoredMessage = require('./sponsored-message');
 
 function Messages (GraphRequest) {
   Object.assign(
diff --git a/client/person/index.js b/client/person/index.js
index dd56a95..1b91f3e 100644
--- a/client/person/index.js
+++ b/client/person/index.js
@@ -1,5 +1,5 @@
 const IdMatching = require('./id-matching'),
-  UserProfile = require('./user-profile');
+      UserProfile = require('./user-profile');
 
 function Person (GraphRequest) {
   Object.assign(this, new IdMatching(GraphRequest), new UserProfile(GraphRequest));
diff --git a/webhook/index.js b/webhook/index.js
index de2e28c..59cd6d9 100644
--- a/webhook/index.js
+++ b/webhook/index.js
@@ -1,6 +1,6 @@
 const express = require('express'),
-  body_parser = require('body-parser'),      
-  util = require('./util');
+      body_parser = require('body-parser'),      
+      util = require('./util');
 
 /**
  * Creates and starts a webhook that emits all received webhook events.
@@ -15,11 +15,11 @@ const express = require('express'),
  */
 function Webhook (options) {
   let app,
-    server,
-    port = options.port || process.env.MESSENGER_PORT || 1337,
-    endpoint = options.endpoint || process.env.MESSENGER_ENDPOINT || '/webhook',
-    app_secret = options.app_secret || process.env.MESSENGER_APP_SECRET,
-    verify_token = options.verify_token || process.env.MESSENGER_VERIFY_TOKEN;
+      server,
+      port = options.port || process.env.MESSENGER_PORT || 1337,
+      endpoint = options.endpoint || process.env.MESSENGER_ENDPOINT || '/webhook',
+      app_secret = options.app_secret || process.env.MESSENGER_APP_SECRET,
+      verify_token = options.verify_token || process.env.MESSENGER_VERIFY_TOKEN;
   
   if (!verify_token) throw 'VERIFY_TOKEN required to create webhook!';
   if (endpoint.indexOf('/') !== 0) endpoint = '/' + endpoint;
diff --git a/webhook/util.js b/webhook/util.js
index c5ae27b..821c27a 100644
--- a/webhook/util.js
+++ b/webhook/util.js
@@ -2,7 +2,7 @@ const crypto = require('crypto');
 
 function verifyWebhook(verify_token, qs) {
   const mode = qs['hub.mode'],
-    token = qs['hub.verify_token'];
+        token = qs['hub.verify_token'];
 
   console.log('Verifying webhook...');