diff --git a/manifests/mysql.pp b/manifests/mysql.pp
index 846f48a..808b48d 100644
--- a/manifests/mysql.pp
+++ b/manifests/mysql.pp
@@ -1,10 +1,10 @@
 # == Class: puppet-lodgeit::mysql
 #
 class lodgeit::mysql(
+  $database_password,
   $mysql_root_password,
   $database_name = $name,
   $database_user = $name,
-  $database_password,
 ) {
   class { '::mysql::server':
     root_password    => $mysql_root_password,
diff --git a/manifests/site.pp b/manifests/site.pp
index cfc5ba8..b34d975 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2,14 +2,14 @@
 #
 
 define lodgeit::site(
-  $port,
   $db_password,
-  $db_host='localhost',
-  $db_name=$name,
-  $db_user=$name,
-  $vhost_name="paste.${name}.org",
-  $image=undef,
-  $robotstxt=true,
+  $port,
+  $db_host    = 'localhost',
+  $db_name    = $name,
+  $db_user    = $name,
+  $image      = undef,
+  $robotstxt  = true,
+  $vhost_name = "paste.${name}.org",
 ) {
 
   include ::httpd