diff --git a/murmur/manifests/init.pp b/murmur/manifests/init.pp
index a4919db..af8c749 100644
--- a/murmur/manifests/init.pp
+++ b/murmur/manifests/init.pp
@@ -1,34 +1,27 @@
 # Install murmur (Mumble server).
 #
-# === Global variables
+# === Parameters
 #
-#   $murmur_ssl_key:
-#       Path to SSL private key.
+#   $ssl_key:
+#       Path to SSL private key. Defaults to puppet node key.
 #
-#   $murmur_ssl_cert:
-#       Path to SSL certificate.
+#   $ssl_cert:
+#       Path to SSL certificate. Defaults to puppet node certificate.
 #
-#   $murmur_password:
+#   $password:
 #       Server passwords. Defaults to none.
 #
-#   $murmur_welcome:
+#   $welcome:
 #       Server welcome message.
 #
-class murmur {
+class murmur($package=$murmur_package_latest,
+             $ssl_key="${puppet_ssldir}/private_keys/${homename}.pem",
+             $ssl_cert="${puppet_ssldir}/certs/${homename}.pem",
+             $password="",
+             $welcome="<br />Welcome to this server running Murmur.<br />") {
 
-    if !$murmur_package {
-        if $murmur_package_latest {
-            $murmur_package = $murmur_package_latest
-        } else {
-            fail("Must define \$murmur_package or \$murmur_package_latest")
-        }
-    }
-
-    if !$murmur_password {
-        $murmur_password = ""
-    }
-    if !$murmur_welcome {
-        $murmur_welcome = "<br />Welcome to this server running Murmur.<br />"
+    if ! $package {
+        fail("Must define parameter package or \$murmur_package_latest")
     }
 
     file { "/usr/local/src/murmur-static_x86.tar.bz2":
@@ -36,7 +29,7 @@ class murmur {
         mode   => "0644",
         owner  => "root",
         group  => "root",
-        source => "puppet:///files/packages/${murmur_package}",
+        source => "puppet:///files/packages/${package}",
     }
     util::extract::tar { "/usr/local/murmur":
         strip   => 1,
@@ -48,20 +41,13 @@ class murmur {
     include user::system
     realize(User["murmur"], Group["murmur"])
 
-    if !$murmur_ssl_key {
-        $murmur_ssl_key = "${puppet_ssldir}/private_keys/${homename}.pem"
-    }
-    if !$murmur_ssl_cert {
-        $murmur_ssl_cert = "${puppet_ssldir}/certs/${homename}.pem"
-    }
-
     include ssl
     file { "${ssl::certs}/murmur.crt":
         ensure => present,
         mode   => "0644",
         owner  => "root",
         group  => "root",
-        source => $murmur_ssl_cert,
+        source => $ssl_cert,
         notify => Service["murmur"],
     }
     file { "${ssl::private}/murmur.key":
@@ -69,7 +55,7 @@ class murmur {
         mode    => "0640",
         owner   => "root",
         group   => "murmur",
-        source  => $murmur_ssl_key,
+        source  => $ssl_key,
         require => Group["murmur"],
         notify  => Service["murmur"],
     }
diff --git a/murmur/templates/murmur.ini.erb b/murmur/templates/murmur.ini.erb
index 532f8c3..4bc347d 100644
--- a/murmur/templates/murmur.ini.erb
+++ b/murmur/templates/murmur.ini.erb
@@ -67,7 +67,7 @@ pidfile=/srv/murmur/murmur.pid
 # configure it here than through D-Bus or Ice.
 #
 # Welcome message sent to clients when they connect
-welcometext="<%= @murmur_welcome %>"
+welcometext="<%= @welcome %>"
 
 # Port to bind TCP and UDP sockets to
 port=64738
@@ -77,7 +77,7 @@ port=64738
 #host=
 
 # Password to join server
-serverpassword=<%= @murmur_password %>
+serverpassword=<%= @password %>
 
 # Maximum bandwidth (in bits per second) clients are allowed
 # to send speech at.