diff --git a/sample.env b/sample.env
index 202fe68220a..6f510af1071 100644
--- a/sample.env
+++ b/sample.env
@@ -1,7 +1,3 @@
-# ---------------------
-# API
-# ---------------------
-
 # Database
 MONGOHQ_URL=mongodb://localhost:27017/freecodecamp
 
@@ -20,18 +16,10 @@ SESSION_SECRET=a_session_secret
 COOKIE_SECRET=a_cookie_secret
 JWT_SECRET=a_jwt_secret
 
-# ---------------------
-# Search
-# ---------------------
-
 # Client Search Bar
 ALGOLIA_APP_ID=app_id_from_algolia_dashboard
 ALGOLIA_API_KEY=api_key_from_algolia_dashboard
 
-# ---------------------
-# Donations
-# ---------------------
-
 # Stripe
 STRIPE_PUBLIC_KEY=pk_from_stripe_dashboard
 STRIPE_SECRET_KEY=sk_from_stripe_dashboard
@@ -43,9 +31,22 @@ PAYPAL_VERIFY_WEBHOOK_URL=https://api.sandbox.paypal.com/v1/notifications/verify
 PAYPAL_API_TOKEN_URL=https://api.sandbox.paypal.com/v1/oauth2/token
 PAYPAL_WEBHOOK_ID=webhook_id_from_paypal_dashboard
 
+# Webhook proxy url from smee.io for PayPal
+WEBHOOK_PROXY_URL=
+
 # Patreon
 PATREON_CLIENT_ID=id_from_patreon_dashboard
 
+# Analytics
+GROWTHBOOK_URI=api_URI_from_Growthbook_dashboard
+
+# Application paths
+HOME_LOCATION=http://localhost:8000
+API_LOCATION=http://localhost:3000
+FORUM_LOCATION=https://forum.freecodecamp.org
+NEWS_LOCATION=https://www.freecodecamp.org/news
+RADIO_LOCATION=https://coderadio.freecodecamp.org
+
 # ---------------------
 # Build variants
 # ---------------------
@@ -60,24 +61,10 @@ CURRICULUM_LOCALE=english
 SHOW_UPCOMING_CHANGES=false
 SHOW_NEW_CURRICULUM=true
 
-# Application paths
-HOME_LOCATION=http://localhost:8000
-API_LOCATION=http://localhost:3000
-FORUM_LOCATION=https://forum.freecodecamp.org
-NEWS_LOCATION=https://www.freecodecamp.org/news
-RADIO_LOCATION=https://coderadio.freecodecamp.org
-
 # ---------------------
-# Debugging Mode Keys
+# Debugging Mode Keys - these should not be used in production
 # ---------------------
-
 PEER=stuff
 DEBUG=true
 LOCAL_MOCK_AUTH=true
 CODESEE=false
-
-# Webhook proxy url from smee.io for PayPal
-WEBHOOK_PROXY_URL=
-
-# Analytics
-GROWTHBOOK_URI=api_URI_from_Growthbook_dashboard