diff --git a/manifests/config.pp b/manifests/config.pp
index 6c2aa64..9c44b75 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -7,33 +7,33 @@
 class askbot::config (
   $db_password,
   $redis_password,
-  $site_root                    = '/srv/askbot-site',
-  $dist_root                    = '/srv/dist',
-  $www_group                    = 'www-data',
-  $db_provider                  = 'www-data',
-  $db_name                      = 'askbotdb',
-  $db_user                      = 'askbot',
-  $db_host                      = 'localhost',
   $askbot_debug                 = false,
+  $custom_theme_enabled         = false,
+  $custom_theme_name            = undef,
+  $db_host                      = 'localhost',
+  $db_name                      = 'askbotdb',
+  $db_provider                  = 'www-data',
+  $db_user                      = 'askbot',
+  $dist_root                    = '/srv/dist',
   $redis_enabled                = false,
   $redis_prefix                 = 'askbot',
   $redis_port                   = 6378,
   $redis_max_memory             = '256m',
   $redis_bind                   = '127.0.0.1',
-  $site_ssl_enabled             = false,
-  $site_ssl_cert_file_contents  = undef,
-  $site_ssl_key_file_contents   = undef,
-  $site_ssl_chain_file_contents = undef,
-  $site_ssl_cert_file           = '/etc/ssl/certs/ssl-cert-snakeoil.pem',
-  $site_ssl_key_file            = '/etc/ssl/private/ssl-cert-snakeoil.key',
-  $site_ssl_chain_file          = undef,
   $site_name                    = 'askbot',
-  $custom_theme_enabled         = false,
-  $custom_theme_name            = undef,
+  $site_root                    = '/srv/askbot-site',
+  $site_ssl_cert_file           = '/etc/ssl/certs/ssl-cert-snakeoil.pem',
+  $site_ssl_cert_file_contents  = undef,
+  $site_ssl_chain_file          = undef,
+  $site_ssl_chain_file_contents = undef,
+  $site_ssl_enabled             = false,
+  $site_ssl_key_file_contents   = undef,
+  $site_ssl_key_file            = '/etc/ssl/private/ssl-cert-snakeoil.key',
   $solr_enabled                 = false,
-  $smtp_port                    = 25,
   $smtp_host                    = 'localhost',
+  $smtp_port                    = 25,
   $template_settings            = 'askbot/settings.py.erb',
+  $www_group                    = 'www-data',
 ) {
   file { $site_root:
     ensure => directory,
diff --git a/manifests/init.pp b/manifests/init.pp
index c4baf52..d876fa4 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -57,19 +57,19 @@
 class askbot (
   $db_password,
   $redis_password,
-  $dist_root                    = '/srv/dist',
-  $site_root                    = '/srv/askbot-site',
   $askbot_branch                = 'master',
+  $askbot_debug                 = false,
+  $askbot_ensure                = 'present',
   $askbot_tag                   = undef,
   $askbot_revision              = undef,
   $askbot_repo                  = 'https://github.com/ASKBOT/askbot-devel.git',
-  $www_group                    = 'www-data',
-  $www_user                     = 'www-data',
-  $db_provider                  = 'mysql',
-  $db_name                      = 'askbotdb',
-  $db_user                      = 'askbot',
+  $custom_theme_enabled         = false,
+  $custom_theme_name            = undef,
   $db_host                      = 'localhost',
-  $askbot_debug                 = false,
+  $db_name                      = 'askbotdb',
+  $db_provider                  = 'mysql',
+  $db_user                      = 'askbot',
+  $dist_root                    = '/srv/dist',
   $redis_enabled                = false,
   $redis_prefix                 = 'askbot',
   $redis_port                   = 6378,
@@ -83,13 +83,13 @@ class askbot (
   $site_ssl_key_file            = '/etc/ssl/private/ssl-cert-snakeoil.key',
   $site_ssl_chain_file          = undef,
   $site_name                    = 'askbot',
-  $custom_theme_enabled         = false,
-  $custom_theme_name            = undef,
+  $site_root                    = '/srv/askbot-site',
   $solr_enabled                 = false,
-  $smtp_port                    = '25',
   $smtp_host                    = 'localhost',
+  $smtp_port                    = '25',
   $template_settings            = 'askbot/settings.py.erb',
-  $askbot_ensure                = 'present',
+  $www_group                    = 'www-data',
+  $www_user                     = 'www-data',
 ) {
 
   class { '::askbot::install':
diff --git a/manifests/site/config.pp b/manifests/site/config.pp
index a060a18..8da9385 100644
--- a/manifests/site/config.pp
+++ b/manifests/site/config.pp
@@ -1,24 +1,24 @@
 # == Class: askbot::site::config
 # This class configure and askbot site
 class askbot::site::config (
-  $site_root,
-  $dist_root,
-  $db_provider,
-  $db_name,
-  $db_user,
-  $db_password,
-  $db_host,
   $askbot_debug,
-  $smtp_host,
-  $smtp_port,
+  $custom_theme_enabled,
+  $custom_theme_name,
+  $db_host,
+  $db_name,
+  $db_password,
+  $db_provider,
+  $db_user,
   $redis_enabled,
   $redis_prefix,
   $redis_port,
   $redis_max_memory,
   $redis_bind,
   $redis_password,
-  $custom_theme_enabled,
-  $custom_theme_name,
+  $dist_root,
+  $site_root,
+  $smtp_host,
+  $smtp_port,
   $solr_enabled,
   $template_settings,
 ) {
diff --git a/manifests/site/http.pp b/manifests/site/http.pp
index a39b1e5..58e2a02 100644
--- a/manifests/site/http.pp
+++ b/manifests/site/http.pp
@@ -1,8 +1,8 @@
 # == Class: askbot::site::http
 # This class describes the http server configuration
 class askbot::site::http (
-  $site_root,
   $site_name,
+  $site_root,
   $site_template = 'askbot/askbot.vhost.erb',
 ) {
   ::httpd::vhost { $site_name:
diff --git a/manifests/site/setup_template.pp b/manifests/site/setup_template.pp
index 7727b6c..043aa5d 100644
--- a/manifests/site/setup_template.pp
+++ b/manifests/site/setup_template.pp
@@ -8,8 +8,8 @@
 #   - $dest_dir: destination directory of target files.
 #
 define askbot::site::setup_template (
-  $template_path,
   $dest_dir,
+  $template_path,
 ) {
   file { "${dest_dir}/${name}":
     ensure => present,
diff --git a/manifests/site/ssl.pp b/manifests/site/ssl.pp
index 27251a5..833a637 100644
--- a/manifests/site/ssl.pp
+++ b/manifests/site/ssl.pp
@@ -2,12 +2,12 @@
 # This class describes the http server's SSL configuration
 class askbot::site::ssl (
   $site_name,
-  $site_ssl_cert_file_contents  = undef,
-  $site_ssl_key_file_contents   = undef,
-  $site_ssl_chain_file_contents = undef,
   $site_ssl_cert_file           = '/etc/ssl/certs/ssl-cert-snakeoil.pem',
-  $site_ssl_key_file            = '/etc/ssl/private/ssl-cert-snakeoil.key',
+  $site_ssl_cert_file_contents  = undef,
   $site_ssl_chain_file          = undef,
+  $site_ssl_chain_file_contents = undef,
+  $site_ssl_key_file            = '/etc/ssl/private/ssl-cert-snakeoil.key',
+  $site_ssl_key_file_contents   = undef,
 ) {
   include ::httpd::ssl