Changes conforming to JSLint