diff --git a/conf/application.conf b/conf/application.conf
index d12ea2a9..cd290ee3 100644
--- a/conf/application.conf
+++ b/conf/application.conf
@@ -1,6 +1,3 @@
-# This is the main configuration file for the application.
-# ~~~~~
-
 play {
   modules {
     enabled += services.github.GitHubModule
@@ -32,34 +29,21 @@ github.committerTeams = ["Owners", "Integrators"]
 github.organisation = "playframework"
 github.apiUrl = "https://api.github.com"
 
-# Example projects
 examples.apiUrl = "https://example.lightbend.com/v1/api/templates"
 examples.playVersions = [ "2.7.x", "2.6.x" ]
 examples.cache.ttl = 1 hour
 
-# Database configuration
-# ~~~~~
-# You can declare as many datasources as you want.
-# By convention, the default datasource is named `default`
-#
 db.default.driver=com.mysql.jdbc.Driver
 db.default.url="jdbc:mysql://localhost:3306/test"
 db.default.username="root"
 db.default.password=""
 
-# Evolutions
-# ~~~~~
-# You can disable evolutions if needed
 play.modules.evolutions.db.default.autoApply = true
 
-# Logger
-# ~~~~~
-# You can also configure logback (http://logback.qos.ch/), by providing a logger.xml file in the conf directory .
-
 documentation.home=testdocs
 
-# The loader dispatcher is used by the actor that loads files out of git.  All blocking git IO is done on these
-# threads.
+# The loader dispatcher is used by the actor that loads files out of git.
+# All blocking git IO is done on these threads.
 loader-dispatcher {
   type = Dispatcher
   executor = "thread-pool-executor"
@@ -126,146 +110,41 @@ documentation {
     }
   ]
   redirects = [
-    {
-      from = "AkkaCore"
-      to = "ThreadPools"
-    },
-    {
-      from = "Installing"
-      to = "Requirements"
-    },
-    {
-      from = "AssetsGoogleClosureCompiler"
-      to = "RequireJS-support"
-    },
-    {
-      from = "CertificateRevocation"
-      to = "https://lightbend.github.io/ssl-config/CertificateRevocation.html"
-    },
-    {
-      from = "CipherSuites"
-      to = "https://lightbend.github.io/ssl-config/CipherSuites.html"
-    },
-    {
-      from = "HostnameVerification"
-      to = "https://lightbend.github.io/ssl-config/HostnameVerification.html"
-    },
-    {
-      from = "Protocols"
-      to = "https://lightbend.github.io/ssl-config/Protocols.html"
-    },
-    {
-      from = "PullRequests"
-      to = "https://www.playframework.com/contributing"
-    },
-    {
-      from = "WSQuickStart"
-      to = "https://lightbend.github.io/ssl-config/WSQuickStart.html"
-    },
-    {
-      from = "ExampleSSLConfig"
-      to = "https://lightbend.github.io/ssl-config/ExampleSSLConfig.html"
-    },
-    {
-      from = "JavaJson"
-      to = "JavaJsonActions"
-    },
-    {
-      from = "HttpApi"
-      to = "ScalaActions"
-    },
-    {
-      from = "ScalaEmbeddingPlay"
-      to = "ScalaEmbeddingPlayAkkaHttp"
-    },
-    {
-      from = "ScalaJsonGenerics"
-      to = "ScalaJson"
-    },
-    {
-      from = "ScalaJsonInception"
-      to = "ScalaJsonAutomated"
-    },
-    {
-      from = "JavaInterceptors"
-      to = "JavaActionCreator"
-    },
-    {
-      from = "JavaJsonRequests"
-      to = "JavaJsonActions"
-    },
-    {
-      from = "KeyStores"
-      to = "https://lightbend.github.io/ssl-config/KeyStores.html"
-    },
-    {
-      from = "ScalaFunctionalTest"
-      to = "ScalaFunctionalTestingWithScalaTest"
-    },
-    {
-      from = "CertificateGeneration"
-      to = "https://lightbend.github.io/ssl-config/CertificateGeneration.html"
-    },
-    {
-      from = "LooseSSL"
-      to = "https://lightbend.github.io/ssl-config/LooseSSL.html"
-    },
-    {
-      from = "ScalaGlobal"
-      to = "GlobalSettings"
-    },
-    {
-      from = "ScalaInterceptors"
-      to = "ScalaHttpFilters"
-    },
-    {
-      from = "JavaGlobal"
-      to = "GlobalSettings"
-    },
-    {
-      from = "JavaTodoList"
-      to = "HelloWorldTutorial"
-    },
-    {
-      from = "ScalaFormHelpers"
-      to = "ScalaForms"
-    },
-    {
-      from = "ScalaTodoList"
-      to = "HelloWorldTutorial"
-    },
-    {
-      from = "JavaJson"
-      to = "JavaJsonActions"
-    },
-    {
-      from = "ProductionDist"
-      to = "Production"
-    },
-    {
-      from = "ScalaJsonRequests"
-      to = "ScalaJson"
-    },
-    {
-      from = "ScalaTest"
-      to = "ScalaTestingYourApplication"
-    },
-    {
-      from = "Samples"
-      to = "https://developer.lightbend.com/start/?group=play"
-    },
-    {
-      from = "ScalaAnorm"
-      to = "https://playframework.github.io/anorm/"
-    },
-    {
-      from = "JavaRoutingDSL"
-      to = "JavaRoutingDsl"
-    },
-    {
-      from = "CSPFilter"
-      to = "CspFilter"
-    }
+    { from = "AkkaCore",                    to = "ThreadPools"                                                       },
+    { from = "AssetsGoogleClosureCompiler", to = "RequireJS-support"                                                 },
+    { from = "CSPFilter",                   to = "CspFilter"                                                         },
+    { from = "CertificateGeneration",       to = "https://lightbend.github.io/ssl-config/CertificateGeneration.html" },
+    { from = "CertificateRevocation",       to = "https://lightbend.github.io/ssl-config/CertificateRevocation.html" },
+    { from = "CipherSuites",                to = "https://lightbend.github.io/ssl-config/CipherSuites.html"          },
+    { from = "ExampleSSLConfig",            to = "https://lightbend.github.io/ssl-config/ExampleSSLConfig.html"      },
+    { from = "HostnameVerification",        to = "https://lightbend.github.io/ssl-config/HostnameVerification.html"  },
+    { from = "HttpApi",                     to = "ScalaActions"                                                      },
+    { from = "Installing",                  to = "Requirements"                                                      },
+    { from = "JavaGlobal",                  to = "GlobalSettings"                                                    },
+    { from = "JavaInterceptors",            to = "JavaActionCreator"                                                 },
+    { from = "JavaJson",                    to = "JavaJsonActions"                                                   },
+    { from = "JavaJson",                    to = "JavaJsonActions"                                                   },
+    { from = "JavaJsonRequests",            to = "JavaJsonActions"                                                   },
+    { from = "JavaRoutingDSL",              to = "JavaRoutingDsl"                                                    },
+    { from = "JavaTodoList",                to = "HelloWorldTutorial"                                                },
+    { from = "KeyStores",                   to = "https://lightbend.github.io/ssl-config/KeyStores.html"             },
+    { from = "LooseSSL",                    to = "https://lightbend.github.io/ssl-config/LooseSSL.html"              },
+    { from = "ProductionDist",              to = "Production"                                                        },
+    { from = "Protocols",                   to = "https://lightbend.github.io/ssl-config/Protocols.html"             },
+    { from = "PullRequests",                to = "https://www.playframework.com/contributing"                        },
+    { from = "Samples",                     to = "https://developer.lightbend.com/start/?group=play"                 },
+    { from = "ScalaAnorm",                  to = "https://playframework.github.io/anorm/"                            },
+    { from = "ScalaEmbeddingPlay",          to = "ScalaEmbeddingPlayAkkaHttp"                                        },
+    { from = "ScalaFormHelpers",            to = "ScalaForms"                                                        },
+    { from = "ScalaFunctionalTest",         to = "ScalaFunctionalTestingWithScalaTest"                               },
+    { from = "ScalaGlobal",                 to = "GlobalSettings"                                                    },
+    { from = "ScalaInterceptors",           to = "ScalaHttpFilters"                                                  },
+    { from = "ScalaJsonGenerics",           to = "ScalaJson"                                                         },
+    { from = "ScalaJsonInception",          to = "ScalaJsonAutomated"                                                },
+    { from = "ScalaJsonRequests",           to = "ScalaJson"                                                         },
+    { from = "ScalaTest",                   to = "ScalaTestingYourApplication"                                       },
+    { from = "ScalaTodoList",               to = "HelloWorldTutorial"                                                },
+    { from = "WSQuickStart",                to = "https://lightbend.github.io/ssl-config/WSQuickStart.html"          },
   ]
 }