diff --git a/tsconfig.json b/tsconfig.json
index 8acf660004..75044a0073 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,21 +1,28 @@
 {
     "compilerOptions": {
+        /* Language and Environment */
         "target": "es6",
-        "baseUrl": "src",
         "lib": ["dom", "dom.iterable", "esnext"],
-        "allowJs": true,
-        "skipLibCheck": true,
-        "esModuleInterop": true,
-        "allowSyntheticDefaultImports": true,
-        "strict": true,
-        "forceConsistentCasingInFileNames": true,
-        "noFallthroughCasesInSwitch": true,
+        "jsx": "react-jsx",
+
+        /* Modules and Resolution */
+        "baseUrl": "src",
         "module": "esnext",
         "moduleResolution": "bundler",
         "resolveJsonModule": true,
         "isolatedModules": true,
-        "noEmit": true,
-        "jsx": "react-jsx"
+
+        /* JavaScript Support */
+        "allowJs": true,
+
+        /* Type Checking */
+        "strict": true,
+        "skipLibCheck": true,
+        "forceConsistentCasingInFileNames": true,
+        "noFallthroughCasesInSwitch": true,
+
+        /* Output */
+        "noEmit": true
     },
     "include": [
         "src",