diff --git a/config.yaml b/config.yaml
index 97190a47..438897ba 100644
--- a/config.yaml
+++ b/config.yaml
@@ -18,15 +18,15 @@ options:
       Key ID to import to the apt keyring to support use with arbitary source
       configuration from outside of Launchpad archives or PPA's.
   harden:
-    default:
     type: string
+    default:
     description: |
       Apply system hardening. Supports a space-delimited list of modules
       to run. Supported modules currently include os, ssh, apache and mysql.
   management_plugin:
     type: boolean
     default: False
-    description: enable the management plugin
+    description: Enable the management plugin.
   mirroring-queues:
     type: boolean
     default: True
@@ -79,7 +79,7 @@ options:
       default: '*/5 * * * *'
       description: |
         Cron schedule used to generate rabbitmq stats. If unset
-        no stats will be generated
+        no stats will be generated.
   queue_thresholds:
       type: string
       default: "[['\\*', '\\*', 100, 200]]"
@@ -88,7 +88,7 @@ options:
         in format [<vhost>, <queue>, <warn>, <crit>]
         - ['/', 'queue1', 10, 20]
         - ['/', 'queue2', 200, 300]
-        Wildcards '*' are accepted to monitor all vhosts and/or queues
+        Wildcards '*' are accepted to monitor all vhosts and/or queues.
   connection-backlog:
     type: int
     default:
@@ -176,8 +176,8 @@ options:
       your network interface.
   # Monitoring
   nagios_context:
-    default: "juju"
     type: string
+    default: "juju"
     description: |
       Used by the nrpe-external-master subordinate charm.
       A string that will be prepended to instance name to set the host name
@@ -188,11 +188,11 @@ options:
       If you're running multiple environments with the same services in them
       this allows you to differentiate between them.
   nagios_servicegroups:
-    default: ""
     type: string
+    default: ""
     description: |
       A comma-separated list of nagios servicegroups.
-      If left empty, the nagios_context will be used as the servicegroup
+      If left empty, the nagios_context will be used as the servicegroup.
   # HA configuration (DEPRECATED)
   vip:
     type: string