diff --git a/src/actions/common-actions.js b/src/actions/common-actions.js
index 4d50c050..e15290ef 100644
--- a/src/actions/common-actions.js
+++ b/src/actions/common-actions.js
@@ -1,6 +1,6 @@
 import Reflux from 'reflux';
 
-var CommonActions = Reflux.createActions([
+let CommonActions = Reflux.createActions([
     'changeLanguage'
 ]);
 
diff --git a/src/actions/user-actions.js b/src/actions/user-actions.js
index 3d0313ef..ef6b8ae9 100644
--- a/src/actions/user-actions.js
+++ b/src/actions/user-actions.js
@@ -1,6 +1,6 @@
 import Reflux from 'reflux';
 
-var UserActions = Reflux.createActions([
+let UserActions = Reflux.createActions([
 	'checkLoginStatus',
 	'login',
 	'logout'
diff --git a/src/app/App.js b/src/app/App.js
index c4a1b1b5..d06978b6 100644
--- a/src/app/App.js
+++ b/src/app/App.js
@@ -6,7 +6,7 @@ import {RouteHandler}     from 'react-router';
 import CommonActions      from 'actions/common-actions';
 import CommonStore        from 'stores/common-store';
 
-var App = React.createClass({
+let App = React.createClass({
 
     mixins: [Reflux.listenTo(CommonStore, 'onCommonStoreChanged')],
 
diff --git a/src/app/demo/components-demo-page.js b/src/app/demo/components-demo-page.js
index 2bb7e7bb..9b499a6f 100644
--- a/src/app/demo/components-demo-page.js
+++ b/src/app/demo/components-demo-page.js
@@ -10,9 +10,9 @@ import Checkbox         from 'core-components/checkbox';
 import Widget           from 'core-components/widget';
 import DropDown         from 'core-components/drop-down';
 
-var dropDownItems = [{content: 'English'}, {content: 'Spanish'}, {content: 'German'}, {content: 'Portuguese'}, {content: 'Japanese'}];
+let dropDownItems = [{content: 'English'}, {content: 'Spanish'}, {content: 'German'}, {content: 'Portuguese'}, {content: 'Japanese'}];
 
-var DemoPage = React.createClass({
+let DemoPage = React.createClass({
 
 	propTypes: {
 		currentUser: React.PropTypes.object.isRequired
diff --git a/src/app/main/main-home/main-home-page-login-widget.js b/src/app/main/main-home/main-home-page-login-widget.js
index 9e1cb772..2066a0c1 100644
--- a/src/app/main/main-home/main-home-page-login-widget.js
+++ b/src/app/main/main-home/main-home-page-login-widget.js
@@ -10,7 +10,7 @@ import Checkbox           from 'core-components/checkbox';
 import Widget             from 'core-components/widget';
 import WidgetTransition   from 'core-components/widget-transition';
 
-var MainHomePageLoginWidget = React.createClass({
+let MainHomePageLoginWidget = React.createClass({
 
     getInitialState() {
         return {
diff --git a/src/app/main/main-home/main-home-page.js b/src/app/main/main-home/main-home-page.js
index 6a16a442..291b4a3d 100644
--- a/src/app/main/main-home/main-home-page.js
+++ b/src/app/main/main-home/main-home-page.js
@@ -4,7 +4,7 @@ import {RouteHandler}     from 'react-router';
 
 import MainHomePageLoginWidget  from 'app/main/main-home/main-home-page-login-widget';
 
-var MainHomePage = React.createClass({
+let MainHomePage = React.createClass({
 
 	render() {
 		return (
diff --git a/src/app/main/main-layout-footer.js b/src/app/main/main-layout-footer.js
index 532cfa1d..6e53ab2b 100644
--- a/src/app/main/main-layout-footer.js
+++ b/src/app/main/main-layout-footer.js
@@ -1,6 +1,6 @@
 import React              from 'react/addons';
 
-var MainLayoutFooter = React.createClass({
+let MainLayoutFooter = React.createClass({
 
     render() {
         return (
diff --git a/src/app/main/main-layout-header.js b/src/app/main/main-layout-header.js
index 23dceac7..f170f267 100644
--- a/src/app/main/main-layout-header.js
+++ b/src/app/main/main-layout-header.js
@@ -7,8 +7,8 @@ import Button             from 'core-components/button';
 import DropDown           from 'core-components/drop-down';
 import Icon               from 'core-components/icon';
 
-var languageList = ['English', 'Spanish', 'Portuguese', 'German', 'Turkish', 'Indian'];
-var codeLanguages = {
+let languageList = ['English', 'Spanish', 'Portuguese', 'German', 'Turkish', 'Indian'];
+let codeLanguages = {
     'English': 'us',
     'Spanish': 'es',
     'Portuguese': 'pt',
@@ -17,7 +17,7 @@ var codeLanguages = {
     'Indian': 'in'
 };
 
-var MainLayoutHeader = React.createClass({
+let MainLayoutHeader = React.createClass({
 
     render() {
         return (
@@ -44,7 +44,7 @@ var MainLayoutHeader = React.createClass({
     },
 
     changeLanguage(event) {
-        var language = languageList[event.index];
+        let language = languageList[event.index];
 
         CommonActions.changeLanguage(codeLanguages[language]);
     }
diff --git a/src/app/main/main-layout.js b/src/app/main/main-layout.js
index 61a77603..a5fcf55f 100644
--- a/src/app/main/main-layout.js
+++ b/src/app/main/main-layout.js
@@ -4,7 +4,7 @@ import {RouteHandler}     from 'react-router';
 import MainHeader         from 'app/main/main-layout-header';
 import MainFooter         from 'app/main/main-layout-footer';
 
-var MainLayout = React.createClass({
+let MainLayout = React.createClass({
 
     render() {
         return (
diff --git a/src/app/main/main-signup/main-signup-page.js b/src/app/main/main-signup/main-signup-page.js
index 19808e58..b4a7f1ad 100644
--- a/src/app/main/main-signup/main-signup-page.js
+++ b/src/app/main/main-signup/main-signup-page.js
@@ -11,7 +11,7 @@ import Input              from 'core-components/input';
 import Widget             from 'core-components/widget';
 import WidgetTransition   from 'core-components/widget-transition';
 
-var MainSignUpPageWidget = React.createClass({
+let MainSignUpPageWidget = React.createClass({
 
     render() {
         return (
diff --git a/src/core-components/button.js b/src/core-components/button.js
index 67204801..d0c58b29 100644
--- a/src/core-components/button.js
+++ b/src/core-components/button.js
@@ -4,7 +4,7 @@ import {Navigation}       from 'react-router';
 
 import callback           from 'lib/callback';
 
-var Button = React.createClass({
+let Button = React.createClass({
 
     mixins: [Navigation],
 
@@ -37,7 +37,7 @@ var Button = React.createClass({
     },
 
     getClass() {
-        var classes = {
+        let classes = {
             'button': true
         };
 
@@ -54,4 +54,4 @@ var Button = React.createClass({
     }
 });
 
-export default Button;
\ No newline at end of file
+export default Button;
diff --git a/src/core-components/checkbox.js b/src/core-components/checkbox.js
index 2295415f..1bfff8c4 100644
--- a/src/core-components/checkbox.js
+++ b/src/core-components/checkbox.js
@@ -5,7 +5,7 @@ import _                  from 'lodash';
 import callback           from 'lib/callback';
 import getIcon            from 'lib/get-icon';
 
-var CheckBox = React.createClass({
+let CheckBox = React.createClass({
 
     propTypes: {
         alignment: React.PropTypes.string,
@@ -38,7 +38,7 @@ var CheckBox = React.createClass({
     },
 
     getProps() {
-        var props = _.clone(this.props);
+        let props = _.clone(this.props);
 
         props.type = 'checkbox';
 
@@ -52,7 +52,7 @@ var CheckBox = React.createClass({
     },
 
     getClass() {
-        var classes = {
+        let classes = {
             'checkbox': true,
             'checkbox_checked': this.state.checked,
 
@@ -95,4 +95,4 @@ var CheckBox = React.createClass({
     }
 });
 
-export default CheckBox;
\ No newline at end of file
+export default CheckBox;
diff --git a/src/core-components/drop-down.js b/src/core-components/drop-down.js
index 8bfa95de..3e17069f 100644
--- a/src/core-components/drop-down.js
+++ b/src/core-components/drop-down.js
@@ -5,7 +5,7 @@ import {Motion, spring}   from 'react-motion';
 
 import callback           from 'lib/callback';
 
-var DropDown = React.createClass({
+let DropDown = React.createClass({
 
     propTypes: {
         defaultSelectedIndex: React.PropTypes.number,
@@ -31,11 +31,11 @@ var DropDown = React.createClass({
     },
 
     getAnimationStyles() {
-        var closedStyle = {
+        let closedStyle = {
             opacity: spring(0, [200, 20]),
             translateY: spring(20, [200, 20])
         };
-        var openedStyle = {
+        let openedStyle = {
             opacity: spring(1, [200, 20]),
             translateY: spring(0, [200, 20])
         };
@@ -47,7 +47,7 @@ var DropDown = React.createClass({
     },
 
     render() {
-        var animation = this.getAnimationStyles();
+        let animation = this.getAnimationStyles();
 
         return (
             <div className={this.getClass()}>
@@ -62,7 +62,7 @@ var DropDown = React.createClass({
     },
 
     renderList({opacity, translateY}) {
-        var style = { opacity: opacity, transform: `translateY(${translateY}px)`};
+        let style = { opacity: opacity, transform: `translateY(${translateY}px)`};
 
         return (
             <div className="drop-down--list-container" style={style}>
@@ -82,7 +82,7 @@ var DropDown = React.createClass({
     },
 
     getClass() {
-        var classes = {
+        let classes = {
             'drop-down': true,
 
             [this.props.className]: (this.props.className)
diff --git a/src/core-components/form.js b/src/core-components/form.js
index b67a1536..7014b7e6 100644
--- a/src/core-components/form.js
+++ b/src/core-components/form.js
@@ -6,7 +6,7 @@ import {reactDFS, renderChildrenWithProps}  from 'lib/react-dfs';
 import Input              from 'core-components/input';
 import Checkbox           from 'core-components/checkbox';
 
-var Form = React.createClass({
+let Form = React.createClass({
 
     validations: {},
 
@@ -17,7 +17,7 @@ var Form = React.createClass({
     },
 
     componentDidMount() {
-        var formState = {};
+        let formState = {};
 
         reactDFS(this.props.children, (child) => {
             if (child.type === Input) {
@@ -42,7 +42,7 @@ var Form = React.createClass({
     },
 
     getProps() {
-        var props = _.clone(this.props);
+        let props = _.clone(this.props);
 
         props.onSubmit = this.handleSubmit;
 
@@ -50,7 +50,7 @@ var Form = React.createClass({
     },
 
     getInputProps({props, type}) {
-        var additionalProps = {};
+        let additionalProps = {};
 
         if (type === Input || type === Checkbox) {
             let inputName = props.name;
@@ -75,7 +75,7 @@ var Form = React.createClass({
     },
 
     handleInputChange(inputName, type, event) {
-        var form = _.clone(this.state.form);
+        let form = _.clone(this.state.form);
 
         form[inputName] = event.target.value;
 
@@ -89,4 +89,4 @@ var Form = React.createClass({
     }
 });
 
-export default Form;
\ No newline at end of file
+export default Form;
diff --git a/src/core-components/icon.js b/src/core-components/icon.js
index bb4cb283..0ead35eb 100644
--- a/src/core-components/icon.js
+++ b/src/core-components/icon.js
@@ -1,6 +1,6 @@
 import React from 'react';
 
-var Icon = React.createClass({
+let Icon = React.createClass({
 
     propTypes: {
         name: React.PropTypes.string.isRequired
@@ -14,4 +14,4 @@ var Icon = React.createClass({
 
 });
 
-export default Icon;
\ No newline at end of file
+export default Icon;
diff --git a/src/core-components/input.js b/src/core-components/input.js
index a107eadf..06765483 100644
--- a/src/core-components/input.js
+++ b/src/core-components/input.js
@@ -2,7 +2,7 @@ import React              from 'react';
 import classNames         from 'classnames';
 import _                  from 'lodash';
 
-var Input = React.createClass({
+let Input = React.createClass({
 
     propTypes: {
         value: React.PropTypes.string,
@@ -28,7 +28,7 @@ var Input = React.createClass({
     },
 
     getProps() {
-        var props = _.clone(this.props);
+        let props = _.clone(this.props);
 
         props.type = (this.props.password) ? 'password' : 'text';
 
@@ -36,7 +36,7 @@ var Input = React.createClass({
     },
 
     getClass() {
-        var classes = {
+        let classes = {
             'input': true,
             ['input_' + this.props.inputType]: true,
 
@@ -47,4 +47,4 @@ var Input = React.createClass({
     }
 });
 
-export default Input;
\ No newline at end of file
+export default Input;
diff --git a/src/core-components/widget-transition.js b/src/core-components/widget-transition.js
index 0a5bd537..8f234e4b 100644
--- a/src/core-components/widget-transition.js
+++ b/src/core-components/widget-transition.js
@@ -5,7 +5,7 @@ import {Motion, spring}   from 'react-motion';
 
 import Widget             from 'core-components/widget';
 
-var WidgetTransition = React.createClass({
+let WidgetTransition = React.createClass({
 
     propTypes: {
         sideToShow: React.PropTypes.string
@@ -35,7 +35,7 @@ var WidgetTransition = React.createClass({
         return (
             <div className={this.getClass()}>
                 {React.Children.map(this.props.children, function (child, index) {
-                    var modifiedChild;
+                    let modifiedChild;
 
                     if (index === 0) {
                         modifiedChild = React.cloneElement(child, {
@@ -60,7 +60,7 @@ var WidgetTransition = React.createClass({
     },
 
     getClass() {
-        var classes = {
+        let classes = {
             'widget-transition': true,
             [this.props.className]: (this.props.className)
         };
@@ -75,4 +75,4 @@ var WidgetTransition = React.createClass({
     }
 });
 
-export default WidgetTransition;
\ No newline at end of file
+export default WidgetTransition;
diff --git a/src/core-components/widget.js b/src/core-components/widget.js
index bef7d665..0c4bc48d 100644
--- a/src/core-components/widget.js
+++ b/src/core-components/widget.js
@@ -1,7 +1,7 @@
 import React from 'react/addons';
 import classNames from 'classnames';
 
-var Widget = React.createClass({
+let Widget = React.createClass({
     propTypes: {
         title: React.PropTypes.string,
         children: React.PropTypes.node.isRequired
@@ -23,7 +23,7 @@ var Widget = React.createClass({
     },
 
     renderTitle() {
-        var titleNode = null;
+        let titleNode = null;
 
         if (this.props.title) {
             titleNode = <h2 className="widget--title">{this.props.title}</h2>;
@@ -33,7 +33,7 @@ var Widget = React.createClass({
     },
 
     getClass() {
-        var classes = {
+        let classes = {
             'widget': true
         };
 
@@ -43,4 +43,4 @@ var Widget = React.createClass({
     }
 });
 
-export default Widget;
\ No newline at end of file
+export default Widget;
diff --git a/src/data/i18n-data.js b/src/data/i18n-data.js
index 0b3f54f2..9fa00759 100644
--- a/src/data/i18n-data.js
+++ b/src/data/i18n-data.js
@@ -1,13 +1,13 @@
 import keys         from 'data/i18n-keys'
 
-var languages = [
+let languages = [
     'en',
     'es'
 ];
 
 
-var i18nData = function (key, lang) {
-    var langIndex = languages.indexOf(lang);
+let i18nData = function (key, lang) {
+    let langIndex = languages.indexOf(lang);
 
     return keys[key][langIndex];
 };
diff --git a/src/lib/callback.js b/src/lib/callback.js
index db0115d5..f54d3cf2 100644
--- a/src/lib/callback.js
+++ b/src/lib/callback.js
@@ -2,8 +2,8 @@ import _ from 'lodash';
 
 export default function (defaultFunction, callback, options = {}, extraPreventions = []) {
     return function (nativeEvent) {
-        var preventions = {'default': false};
-        var event = _.extend({}, nativeEvent, options, {
+        let preventions = {'default': false};
+        let event = _.extend({}, nativeEvent, options, {
             preventDefault() {
                 nativeEvent.preventDefault();
                 preventions['default'] = true;
diff --git a/src/lib/get-icon.js b/src/lib/get-icon.js
index f3a0e331..6e53b22b 100644
--- a/src/lib/get-icon.js
+++ b/src/lib/get-icon.js
@@ -2,7 +2,7 @@ import React   from 'react';
 import _       from 'lodash';
 
 export default function () {
-    var className = 'fa';
+    let className = 'fa';
 
     _.each(arguments, (arg) => {
         className += ' fa-' + arg;
diff --git a/src/lib/i18n.js b/src/lib/i18n.js
index 12396fdb..8334c99c 100644
--- a/src/lib/i18n.js
+++ b/src/lib/i18n.js
@@ -3,11 +3,11 @@ import MessageFormat      from 'messageformat';
 import CommonStore        from 'stores/common-store';
 import i18nData           from 'data/i18n-data';
 
-var mf = new MessageFormat('en');
+let mf = new MessageFormat('en');
 
-var i18n = function (key, params = null) {
-    var i18nKey = i18nData(key, CommonStore.language);
-    var message = mf.compile(i18nKey);
+let i18n = function (key, params = null) {
+    let i18nKey = i18nData(key, CommonStore.language);
+    let message = mf.compile(i18nKey);
 
     return message(params);
 };
diff --git a/src/lib/react-dfs.js b/src/lib/react-dfs.js
index 8c349113..b1d23482 100644
--- a/src/lib/react-dfs.js
+++ b/src/lib/react-dfs.js
@@ -1,8 +1,8 @@
 import React     from 'react/addons';
 import _         from 'lodash';
 
-var reactDFS = function (children, visitFunction) {
-    var stack = [];
+let reactDFS = function (children, visitFunction) {
+    let stack = [];
 
     React.Children.forEach(children, child => stack.push(child));
     stack.reverse();
@@ -20,13 +20,13 @@ var reactDFS = function (children, visitFunction) {
     }
 };
 
-var renderChildrenWithProps = function(children, mapFunction) {
+let renderChildrenWithProps = function(children, mapFunction) {
     if (typeof children !== 'object' || children === null) {
         return children;
     }
 
     return React.Children.map(children, function (child) {
-        var props = mapFunction(child);
+        let props = mapFunction(child);
 
         if (typeof child !== 'object' || child === null) {
             return child;
diff --git a/src/stores/common-store.js b/src/stores/common-store.js
index a70d1c67..de0a0a66 100644
--- a/src/stores/common-store.js
+++ b/src/stores/common-store.js
@@ -2,7 +2,7 @@ import Reflux             from 'reflux';
 
 import CommonActions      from 'actions/common-actions';
 
-var CommonStore = Reflux.createStore({
+let CommonStore = Reflux.createStore({
 
     init() {
         this.language = 'en';
diff --git a/src/stores/user-store.js b/src/stores/user-store.js
index 6afcfd8c..c5f3227c 100644
--- a/src/stores/user-store.js
+++ b/src/stores/user-store.js
@@ -3,7 +3,7 @@ import APIUtils           from 'lib/APIUtils';
 
 import UserActions        from 'actions/user-actions';
 
-var UserStore = Reflux.createStore({
+let UserStore = Reflux.createStore({
 
 	init() {
 		this.user = null;