Updated with JsHint fixes