Improved JSLint compliance