JsLint refactoring
JsLint refactoring