JSLint clean up and stable for current features