diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 0000000000..8844b15a88
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1,2 @@
+# All files should be reviewed by a member of the SDKs team
+* @stripe/api-library-reviewers
diff --git a/.vscode/settings.json b/.vscode/settings.json
index a8e2c78559..cad32ae64b 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -6,18 +6,16 @@
   "editor.formatOnSave": true,
 
   "typescript.updateImportsOnFileMove.enabled": "always",
-  "[typescript]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
-  },
-
   "javascript.updateImportsOnFileMove.enabled": "always",
-  "[javascript]": {
+  "[typescript][javascript]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
 
   // Extension settings
   "npm.packageManager": "yarn",
   "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": "explicit"
+    "source.fixAll.eslint": "explicit",
+    // eslint handles import sorting, don't let VSCode fight it
+    "source.organizeImports": "never"
   }
 }