diff --git a/.env_sample b/.env_sample
index 8723203f1..5abe2e081 100644
--- a/.env_sample
+++ b/.env_sample
@@ -25,7 +25,8 @@ REDIS_URL="redis://localhost:6379"
 # Redis sessions storage
 REDIS_SESSIONS_URL="redis://localhost:6379"
 SESSION_KEY="_Dev_Community_Session"
-SESSION_EXPIRY_SECONDS=1209600 # two weeks in seconds
+# two weeks in seconds
+SESSION_EXPIRY_SECONDS=1209600
 
 # Redis Sidekiq storage
 REDIS_SIDEKIQ_URL="redis://localhost:6379"
@@ -40,19 +41,27 @@ OPENRESTY_URL=""
 FORCE_SSL_IN_RAILS="not applicable in dev"
 
 # Postgres DB
-DATABASE_NAME="Forem_development" # Used when creating a db instance `rails db:create`
-DATABASE_URL="postgresql://localhost:5432/$DATABASE_NAME" # This takes precedence over `DATABASE_NAME` if they don't match
-RAILS_MAX_THREADS=5 # Specifies the number of Puma threads
-WEB_CONCURRENCY=2 # Specifies the number of `workers` to boot in clustered mode.
-DATABASE_POOL_SIZE=5 # The number of concurrent connections to Postgres. If unset the value of RAILS_MAX_THREADS will be used in it's place.
+# Used when creating a db instance `rails db:create`
+DATABASE_NAME="Forem_development"
+# This takes precedence over `DATABASE_NAME` if they don't match
+DATABASE_URL="postgresql://localhost:5432/Forem_development"
+# Specifies the number of Puma threads
+RAILS_MAX_THREADS=5
+# Specifies the number of `workers` to boot in clustered mode.
+WEB_CONCURRENCY=2
+# The number of concurrent connections to Postgres. If unset the value of RAILS_MAX_THREADS will be used in it's place.
+DATABASE_POOL_SIZE=5
 DATABASE_NAME_TEST=Forem_test
-DATABASE_URL_TEST="postgresql://localhost:5432/$DATABASE_NAME_TEST" # Differentiate test db from dev db. Test DB is wiped on each test run.
+# Differentiate test db from dev db. Test DB is wiped on each test run.
+DATABASE_URL_TEST="postgresql://localhost:5432/Forem_test"
 
 # Rails
-RAILS_ENV="development" # Set to 'production' when deploying for security and performance.
+# Set to 'production' when deploying for security and performance.
+RAILS_ENV="development"
 
 # Node
-NODE_ENV="development" # Set to 'production' when deploying for security and performance.
+# Set to 'production' when deploying for security and performance.
+NODE_ENV="development"
 
 ################################################
 ######### Optional 3rd Party Services ##########
@@ -161,6 +170,5 @@ SMTP_USER_NAME=
 SMTP_PASSWORD=
 SMTP_AUTHENTICATION=
 
-
 # Disable simplecov coverage testing when running rspec locally
 COVERAGE="false"