diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp
index 83e4f64..c721429 100644
--- a/manifests/db/mysql.pp
+++ b/manifests/db/mysql.pp
@@ -3,7 +3,7 @@
 # This class can be used to create tables, users and grant
 # privileges for a mysql magnum database.
 #
-# == parameters
+# == Parameters
 #
 # [*password*]
 #   (Required) Password to connect to the database.
@@ -33,9 +33,6 @@
 #   Only used with mysql modules >= 2.2.
 #   Defaults to 'utf8_general_ci'
 #
-# == Dependencies
-#   Class['mysql::server']
-#
 class magnum::db::mysql(
   $password,
   $dbname        = 'magnum',
diff --git a/manifests/db/sync.pp b/manifests/db/sync.pp
index ac6871c..0c4cedb 100644
--- a/manifests/db/sync.pp
+++ b/manifests/db/sync.pp
@@ -4,17 +4,17 @@
 # == Parameters
 #
 # [*user*]
-#   (optional) User to run dbsync command.
+#   (Optional) User to run dbsync command.
 #   Defaults to 'magnum'
 #
 # [*extra_params*]
-#   (optional) String of extra command line parameters to append
+#   (Optional) String of extra command line parameters to append
 #   to the magnum-dbsync command.
 #   Defaults to undef
 #
 # [*exec_path*]
-#   (optional) The path  to use for finding the magnum-db-manage binary.
-#   Defaults to /usr/bin
+#   (Optional) The path  to use for finding the magnum-db-manage binary.
+#   Defaults to '/usr/bin'
 #
 class magnum::db::sync(
   $user         = 'magnum',
diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp
index 728fbc6..4d50cc9 100644
--- a/manifests/keystone/auth.pp
+++ b/manifests/keystone/auth.pp
@@ -5,48 +5,57 @@
 # === Parameters
 #
 # [*password*]
-#   (required) Password for magnum user.
+#   (Required) Password for magnum user.
 #
 # [*auth_name*]
-#   Username for magnum service. Defaults to 'magnum'.
+#   (Optional) Username for magnum service.
+#   Defaults to 'magnum'.
 #
 # [*email*]
-#   Email for magnum user. Defaults to 'magnum@localhost'.
+#   (Optional) Email for magnum user.
+#   Defaults to 'magnum@localhost'.
 #
 # [*tenant*]
-#   Tenant for magnum user. Defaults to 'services'.
+#   (Optional) Tenant for magnum user.
+#   Defaults to 'services'.
 #
 # [*configure_endpoint*]
-#   Should magnum endpoint be configured? Defaults to 'true'.
+#   (Optional) Should magnum endpoint be configured?
+#   Defaults to true.
 #
 # [*configure_user*]
 #   (Optional) Should the service user be configured?
-#   Defaults to 'true'.
+#   Defaults to true.
 #
 # [*configure_user_role*]
 #   (Optional) Should the admin role be configured for the service user?
-#   Defaults to 'true'.
+#   Defaults to true.
 #
 # [*service_type*]
-#   Type of service. Defaults to 'container-infra'.
+#   (Optional) Type of service.
+#   Defaults to 'container-infra'.
 #
 # [*region*]
-#   Region for endpoint. Defaults to 'RegionOne'.
+#   (Optional) Region for endpoint.
+#   Defaults to 'RegionOne'.
 #
 # [*service_name*]
-#   (optional) Name of the service.
+#   (Optional) Name of the service.
 #   Defaults to the value of auth_name.
 #
 # [*public_url*]
-#   (optional) The endpoint's public url. (Defaults to 'http://127.0.0.1:9511/v1')
+#   (0ptional) The endpoint's public url.
 #   This url should *not* contain any trailing '/'.
+#   Defaults to 'http://127.0.0.1:9511/v1'
 #
 # [*admin_url*]
-#   (optional) The endpoint's admin url. (Defaults to 'http://127.0.0.1:9511/v1')
+#   (Optional) The endpoint's admin url.
 #   This url should *not* contain any trailing '/'.
+#   Defaults to 'http://127.0.0.1:9511/v1'
 #
 # [*internal_url*]
-#   (optional) The endpoint's internal url. (Defaults to 'http://127.0.0.1:9511/v1')
+#   (Optional) The endpoint's internal url.
+#   Defaults to 'http://127.0.0.1:9511/v1'
 #
 class magnum::keystone::auth (
   $password,
diff --git a/manifests/logging.pp b/manifests/logging.pp
index 2ced537..499d4e2 100644
--- a/manifests/logging.pp
+++ b/manifests/logging.pp
@@ -4,98 +4,98 @@
 #
 # == parameters
 #
-#  [*debug*]
-#    (Optional) Should the daemons log debug messages
-#    Defaults to $::os_service_default
+# [*debug*]
+#   (Optional) Should the daemons log debug messages
+#   Defaults to $::os_service_default
 #
-#  [*use_syslog*]
-#    (Optional) Use syslog for logging.
-#    Defaults to $::os_service_default
+# [*use_syslog*]
+#   (Optional) Use syslog for logging.
+#   Defaults to $::os_service_default
 #
-#  [*use_json*]
-#    (Optional) Use json for logging.
-#    Defaults to $::os_service_default
+# [*use_json*]
+#   (Optional) Use json for logging.
+#   Defaults to $::os_service_default
 #
-#  [*use_journal*]
-#    (Optional) Use journal for logging.
-#    Defaults to $::os_service_default
+# [*use_journal*]
+#   (Optional) Use journal for logging.
+#   Defaults to $::os_service_default
 #
-#  [*use_stderr*]
-#    (optional) Use stderr for logging
-#    Defaults to $::os_service_default
+# [*use_stderr*]
+#   (Optional) Use stderr for logging
+#   Defaults to $::os_service_default
 #
-#  [*log_facility*]
-#    (Optional) Syslog facility to receive log lines.
-#    Defaults to $::os_service_default
+# [*log_facility*]
+#   (Optional) Syslog facility to receive log lines.
+#   Defaults to $::os_service_default
 #
-#  [*log_dir*]
-#    (optional) Directory where logs should be stored.
-#    If set to boolean false, it will not log to any directory.
-#    Defaults to '/var/log/magnum'.
+# [*log_dir*]
+#   (Optional) Directory where logs should be stored.
+#   If set to boolean false, it will not log to any directory.
+#   Defaults to '/var/log/magnum'.
 #
-#  [*logging_context_format_string*]
-#    (optional) Format string to use for log messages with context.
-#    Defaults to $::os_service_default
-#    Example: '%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s\
-#              [%(request_id)s %(user_identity)s] %(instance)s%(message)s'
+# [*logging_context_format_string*]
+#   (Optional) Format string to use for log messages with context.
+#   Defaults to $::os_service_default
+#   Example: '%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s\
+#             [%(request_id)s %(user_identity)s] %(instance)s%(message)s'
 #
-#  [*logging_default_format_string*]
-#    (optional) Format string to use for log messages without context.
-#    Defaults to $::os_service_default
-#    Example: '%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s\
-#              [-] %(instance)s%(message)s'
+# [*logging_default_format_string*]
+#   (Optional) Format string to use for log messages without context.
+#   Defaults to $::os_service_default
+#   Example: '%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s\
+#             [-] %(instance)s%(message)s'
 #
-#  [*logging_debug_format_suffix*]
-#    (optional) Formatted data to append to log format when level is DEBUG.
-#    Defaults to $::os_service_default
-#    Example: '%(funcName)s %(pathname)s:%(lineno)d'
+# [*logging_debug_format_suffix*]
+#   (Optional) Formatted data to append to log format when level is DEBUG.
+#   Defaults to $::os_service_default
+#   Example: '%(funcName)s %(pathname)s:%(lineno)d'
 #
-#  [*logging_exception_prefix*]
-#    (optional) Prefix each line of exception output with this format.
-#    Defaults to $::os_service_default
-#    Example: '%(asctime)s.%(msecs)03d %(process)d TRACE %(name)s %(instance)s'
+# [*logging_exception_prefix*]
+#   (Optional) Prefix each line of exception output with this format.
+#   Defaults to $::os_service_default
+#   Example: '%(asctime)s.%(msecs)03d %(process)d TRACE %(name)s %(instance)s'
 #
-#  [*log_config_append*]
-#    The name of an additional logging configuration file.
-#    Defaults to $::os_service_default
-#    See https://docs.python.org/2/howto/logging.html
+# [*log_config_append*]
+#   (Optional) The name of an additional logging configuration file.
+#   Defaults to $::os_service_default
+#   See https://docs.python.org/2/howto/logging.html
 #
-#  [*default_log_levels*]
-#    (optional) Hash of logger (keys) and level (values) pairs.
-#    Defaults to $::os_service_default
-#    Example:
-#      { 'amqp'  => 'WARN', 'amqplib' => 'WARN', 'boto' => 'WARN',
-#           'sqlalchemy' => 'WARN', 'suds' => 'INFO',
-#           'oslo.messaging' => 'INFO', 'iso8601' => 'WARN',
-#           'requests.packages.urllib3.connectionpool' => 'WARN',
-#           'urllib3.connectionpool' => 'WARN',
-#           'websocket' => 'WARN', 'magnummiddleware' => 'WARN',
-#           'routes.middleware' => 'WARN', stevedore => 'WARN' }
+# [*default_log_levels*]
+#   (0ptional) Hash of logger (keys) and level (values) pairs.
+#   Defaults to $::os_service_default
+#   Example:
+#     { 'amqp'  => 'WARN', 'amqplib' => 'WARN', 'boto' => 'WARN',
+#          'sqlalchemy' => 'WARN', 'suds' => 'INFO',
+#          'oslo.messaging' => 'INFO', 'iso8601' => 'WARN',
+#          'requests.packages.urllib3.connectionpool' => 'WARN',
+#          'urllib3.connectionpool' => 'WARN',
+#          'websocket' => 'WARN', 'magnummiddleware' => 'WARN',
+#          'routes.middleware' => 'WARN', stevedore => 'WARN' }
 #
-#  [*publish_errors*]
-#    (optional) Publish error events (boolean value).
-#    Defaults to $::os_service_default
+# [*publish_errors*]
+#   (Optional) Publish error events (boolean value).
+#   Defaults to $::os_service_default
 #
-#  [*fatal_deprecations*]
-#    (optional) Make deprecations fatal (boolean value)
-#    Defaults to $::os_service_default
+# [*fatal_deprecations*]
+#   (Optional) Make deprecations fatal (boolean value)
+#   Defaults to $::os_service_default
 #
-#  [*instance_format*]
-#    (optional) If an instance is passed with the log message, format it
-#               like this (string value).
-#    Defaults to $::os_service_default
-#    Example: '[instance: %(uuid)s] '
+# [*instance_format*]
+#   (Optional) If an instance is passed with the log message, format it
+#              like this (string value).
+#   Defaults to $::os_service_default
+#   Example: '[instance: %(uuid)s] '
 #
-#  [*instance_uuid_format*]
-#    (optional) If an instance UUID is passed with the log message, format
-#               it like this (string value).
-#    Defaults to $::os_service_default
-#    Example: instance_uuid_format='[instance: %(uuid)s] '
+# [*instance_uuid_format*]
+#   (Optional) If an instance UUID is passed with the log message, format
+#              it like this (string value).
+#   Defaults to $::os_service_default
+#   Example: instance_uuid_format='[instance: %(uuid)s] '
 #
-#  [*log_date_format*]
-#    (optional) Format string for %%(asctime)s in log records.
-#    Defaults to $::os_service_default
-#    Example: 'Y-%m-%d %H:%M:%S'
+# [*log_date_format*]
+#   (Optional) Format string for %%(asctime)s in log records.
+#   Defaults to $::os_service_default
+#   Example: 'Y-%m-%d %H:%M:%S'
 #
 class magnum::logging(
   $use_syslog                    = $::os_service_default,
diff --git a/manifests/policy.pp b/manifests/policy.pp
index 0651e66..b324e16 100644
--- a/manifests/policy.pp
+++ b/manifests/policy.pp
@@ -5,7 +5,7 @@
 # === Parameters
 #
 # [*policies*]
-#   (optional) Set of policies to configure for magnum
+#   (Optional) Set of policies to configure for magnum
 #   Example :
 #     {
 #       'magnum-context_is_admin' => {
@@ -20,7 +20,7 @@
 #   Defaults to empty hash.
 #
 # [*policy_path*]
-#   (optional) Path to the nova policy.json file
+#   (Optional) Path to the nova policy.json file
 #   Defaults to /etc/magnum/policy.json
 #
 class magnum::policy (