diff --git a/nova/conf/database.py b/nova/conf/database.py
index 0f65ff4f6..e4a0b162a 100644
--- a/nova/conf/database.py
+++ b/nova/conf/database.py
@@ -54,53 +54,42 @@ api_db_opts = [
     cfg.StrOpt('connection',
                secret=True,
                help=''),
-
     cfg.BoolOpt('sqlite_synchronous',
                 default=True,
                 help=''),
-
     cfg.StrOpt('slave_connection',
                secret=True,
                help=''),
-
     cfg.StrOpt('mysql_sql_mode',
                default='TRADITIONAL',
                help=''),
-
     cfg.IntOpt('idle_timeout',
                default=3600,
                help=''),
-
     # TODO(markus_z): We should probably default this to 5 to not rely on the
     # SQLAlchemy default. Otherwise we wouldn't provide a stable default.
     cfg.IntOpt('max_pool_size',
                help=''),
-
     cfg.IntOpt('max_retries',
                default=10,
                help=''),
-
     # TODO(markus_z): This should have a minimum attribute of 0
     cfg.IntOpt('retry_interval',
                default=10,
                help=''),
-
     # TODO(markus_z): We should probably default this to 10 to not rely on the
     # SQLAlchemy default. Otherwise we wouldn't provide a stable default.
     cfg.IntOpt('max_overflow',
                help=''),
-
     # TODO(markus_z): This should probably make use of the "choices" attribute.
     # "oslo.db" uses only the values [<0, 0, 50, 100] see module
     # /oslo_db/sqlalchemy/engines.py method "_setup_logging"
     cfg.IntOpt('connection_debug',
                default=0,
                help=''),
-
     cfg.BoolOpt('connection_trace',
                 default=False,
                 help=''),
-
     # TODO(markus_z): We should probably default this to 30 to not rely on the
     # SQLAlchemy default. Otherwise we wouldn't provide a stable default.
     cfg.IntOpt('pool_timeout',