More JSLint compliance