Started conforming to JSLint