Now JSLint and JSHint compliant