diff --git a/manifests/bot.pp b/manifests/bot.pp
index 5d727f3..dd2a396 100644
--- a/manifests/bot.pp
+++ b/manifests/bot.pp
@@ -18,16 +18,16 @@
 #
 class elastic_recheck::bot (
   $gerrit_host,
-  $gerrit_ssh_host_key = undef,
-  $recheck_gerrit_user = 'elasticrecheck',
-  $recheck_ssh_private_key = undef,
-  $recheck_ssh_public_key = undef,
-  $recheck_bot_passwd,
   $recheck_bot_nick,
-  $elastic_search_url = 'http://logstash.openstack.org:80/elasticsearch',
-  $logstash_url = 'http://logstash.openstack.org',
-  $subunit2sql_db_uri = 'mysql+pymysql://query:query@logstash.openstack.org/subunit2sql',
-  $daemon_args = undef,
+  $recheck_bot_passwd,
+  $daemon_args             = undef,
+  $elastic_search_url      = 'http://logstash.openstack.org:80/elasticsearch',
+  $gerrit_ssh_host_key     = undef,
+  $logstash_url            = 'http://logstash.openstack.org',
+  $recheck_gerrit_user     = 'elasticrecheck',
+  $recheck_ssh_private_key = undef,
+  $recheck_ssh_public_key  = undef,
+  $subunit2sql_db_uri      = 'mysql+pymysql://query:query@logstash.openstack.org/subunit2sql',
 ) {
   include ::elastic_recheck
 
diff --git a/manifests/cron.pp b/manifests/cron.pp
index c58e7e3..fe461fe 100644
--- a/manifests/cron.pp
+++ b/manifests/cron.pp
@@ -18,9 +18,9 @@
 #
 
 class elastic_recheck::cron (
-  $uncat_cmd_options = undef,
-  $graph_all_cmd_options = undef,
+  $graph_all_cmd_options  = undef,
   $graph_gate_cmd_options = undef,
+  $uncat_cmd_options      = undef,
 ) {
   $er_state_path = '/var/lib/elastic-recheck'
   $graph_all_cmd = "elastic-recheck-graph /opt/elastic-recheck/queries -o all-new.json ${graph_all_cmd_options} && mv all-new.json all.json"
diff --git a/manifests/init.pp b/manifests/init.pp
index 46caad4..53c5fd0 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -17,7 +17,7 @@
 #
 class elastic_recheck (
   $git_source_repo = 'https://git.openstack.org/openstack-infra/elastic-recheck',
-  $revision = 'master',
+  $revision        = 'master',
 ) {
 
   group { 'recheck':