jshint/lint, minor cleanup