Clean-up with JSLint