More cleanup based on JSLint results.