Updated with JSLint