Scope shelljs and clean up linting errors