diff --git a/manifests/params.pp b/manifests/params.pp
index 08a1f2d..3cb87be 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -1,174 +1,221 @@
 class kickstack::params {
-  $variable_prefix = "kickstack_"
+  $variable_prefix = 'kickstack_'
 
   # The fact prefix to be used for exportfact:
   # * default "kickstack_"
   # * override by setting "kickstack_fact_prefix"
-  $fact_prefix = pick(getvar("::${variable_prefix}fact_prefix"), 'kickstack_')
+  $fact_prefix = pick(getvar("::${variable_prefix}fact_prefix"),
+                 $variable_prefix)
 
   # The fact category to be used for exportfact, also sets
   # the filename in /etc/facter.d (<category>.txt):
   # * default "kickstack"
   # * override by setting "kickstack_fact_category"
-  $fact_category = pick(getvar("::${variable_prefix}fact_category"), "kickstack")
+  $fact_category = pick(getvar("::${variable_prefix}fact_category"),
+                        'kickstack')
 
   # Whether or not we want to keep OpenStack packages at the latest versions
   # * default 'installed'
   # * override by setting to 'latest'
   # Does not apply to packages outside OpenStack.
-  $package_ensure = pick(getvar("::${variable_prefix}package_ensure"), 'installed')
+  $package_ensure = pick(getvar("::${variable_prefix}package_ensure"),
+                         'installed')
 
   # The strategy to use so machines can make their hostnames known to
   # each other.
   # * default "hosts" -- manage /etc/hosts
-  $name_resolution = pick(getvar("::${variable_prefix}name_resolution"),"hosts")
+  $name_resolution = pick(getvar("::${variable_prefix}name_resolution"),
+                          'hosts')
 
-  # Enables verbose logging globally 
-  $verbose = str2bool(pick(getvar("::${variable_prefix}verbose"), 'false'))
+  # Enables verbose logging globally
+  $verbose = str2bool(pick(getvar("::${variable_prefix}verbose"),
+                           'false'))
 
   # Enables debug logging globally
-  $debug = str2bool(pick(getvar("::${variable_prefix}debug"), 'false'))
+  $debug = str2bool(pick(getvar("::${variable_prefix}debug"),
+                         'false'))
 
   # The database backend type:
   # * default "mysql"
   # * override by setting "kickstack_database"
-  $database = pick(getvar("::${variable_prefix}database"), 'mysql')
+  $database = pick(getvar("::${variable_prefix}database"),
+                          'mysql')
 
   # The mysql "root" user's password
   # (ignored unless kickstack_database=='mysql')
   # * default "kickstack"
   # * override by setting "kickstack_mysql_root_password"
-  $mysql_root_password = pick(getvar("::${variable_prefix}mysql_root_password"), 'kickstack')
+  $mysql_root_password = pick(getvar("::${variable_prefix}mysql_root_password"),
+                              'kickstack')
 
   # The "postgres" user's password
   # (ignored unless kickstack_database=='postgresql')
   # * default "kickstack"
   # * override by setting "kickstack_postgres_password"
-  $postgres_password = pick(getvar("::${variable_prefix}postgres_password"), 'kickstack')
+  $postgres_password = pick(getvar("::${variable_prefix}postgres_password"),
+                            'kickstack')
 
   # The RPC server type:
   # * default "rabbitmq"
   # * override by setting "kickstack_amqp"
-  $rpc = pick(getvar("::${variable_prefix}rpc"), 'rabbitmq')
+  $rpc = pick(getvar("::${variable_prefix}rpc"),
+              'rabbitmq')
 
   # RabbitMQ user name:
-  $rabbit_userid = pick(getvar("::${variable_prefix}rabbit_userid"),'kickstack')
+  $rabbit_userid = pick(getvar("::${variable_prefix}rabbit_userid"),
+                        'kickstack')
 
   # RabbitMQ virtual host
-  $rabbit_virtual_host = pick(getvar("::${variable_prefix}rabbit_virtual_host"),'/')
+  $rabbit_virtual_host = pick(getvar("::${variable_prefix}rabbit_virtual_host"),
+                              '/')
 
   # Qpid user name:
-  $qpid_username = pick(getvar("::${variable_prefix}qpid_username"),'kickstack')
+  $qpid_username = pick(getvar("::${variable_prefix}qpid_username"),
+                        'kickstack')
 
   # Qpid realm:
   $qpid_realm = getvar("::${variable_prefix}qpid_realm")
 
   # The Keystone region to manage
-  $keystone_region = pick(getvar("::${variable_prefix}keystone_region"), 'kickstack')
+  $keystone_region = pick(getvar("::${variable_prefix}keystone_region"),
+                          'kickstack')
 
   # The suffix to append to the keystone hostname for publishing
-  # the public service endpoint
+  # the public service endpoint (default: none)
   $keystone_public_suffix = getvar("::${variable_prefix}keystone_public_suffix")
 
   # The suffix to append to the keystone hostname for publishing
-  # the admin service endpoint
+  # the admin service endpoint (default: none)
   $keystone_admin_suffix = getvar("::${variable_prefix}keystone_admin_suffix")
 
   # The tenant set up so that individual OpenStack services can
   # authenticate with Keystone
-  $keystone_service_tenant = pick(getvar("::${variable_prefix}keystone_service_tenant"),"services")
+  $keystone_service_tenant = pick(getvar("::${variable_prefix}keystone_service_tenant"),
+                                  'services')
 
   # The special tenant set up for administrative purposes
-  $keystone_admin_tenant = pick(getvar("::${variable_prefix}keystone_admin_tenant"),'openstack')
+  $keystone_admin_tenant = pick(getvar("::${variable_prefix}keystone_admin_tenant"),
+                                'openstack')
 
   # The email address set for the admin user
-  $keystone_admin_email = pick(getvar("::${variable_prefix}keystone_admin_email"),"admin@${hostname}")
+  $keystone_admin_email = pick(getvar("::${variable_prefix}keystone_admin_email"),
+                               "admin@${hostname}")
 
   # The initial password to set for the admin user
-  $keystone_admin_password = pick(getvar("::${variable_prefix}keystone_admin_password"),"kickstack")
+  $keystone_admin_password = pick(getvar("::${variable_prefix}keystone_admin_password"),
+                                  'kickstack')
 
-  # The backend to use with Cinder. Supported: iscsi (default), rbd
-  $cinder_backend = pick(getvar("::${variable_prefix}cinder_backend"),"iscsi")
+  # The backend to use with Cinder. Supported: iscsi (default)
+  $cinder_backend = pick(getvar("::${variable_prefix}cinder_backend"),
+                         'iscsi')
 
-  # The device to create the LVM physical volume on. Ignored unless $cinder_backend==iscsi.
-  $cinder_lvm_pv = pick(getvar("::${variable_prefix}cinder_lvm_pv"),"/dev/disk/by-partlabel/cinder-volumes")
+  # The device to create the LVM physical volume on. Ignored unless
+  # $cinder_backend==iscsi.
+  $cinder_lvm_pv = pick(getvar("::${variable_prefix}cinder_lvm_pv"),
+                        '/dev/disk/by-partlabel/cinder-volumes')
 
-  # The LVM volume group name to use for volumes. Ignored unless $cinder_backend==iscsi.
-  $cinder_lvm_vg = pick(getvar("::${variable_prefix}cinder_lvm_vg"),"cinder-volumes")
+  # The LVM volume group name to use for volumes. Ignored unless
+  # $cinder_backend==iscsi.
+  $cinder_lvm_vg = pick(getvar("::${variable_prefix}cinder_lvm_vg"),
+                        'cinder-volumes')
 
   # The RADOS pool to use for volumes. Ignored unless $cinder_backend==rbd.
-  $cinder_rbd_pool = pick(getvar("::${variable_prefix}cinder_rbd_pool"),"cinder-volumes")
+  $cinder_rbd_pool = pick(getvar("::${variable_prefix}cinder_rbd_pool"),
+                          'cinder-volumes')
 
   # The RADOS user to use for volumes. Ignored unless $cinder_backend==rbd.
-  $cinder_rbd_user = pick(getvar("::${variable_prefix}cinder_rbd_pool"),"cinder")
+  $cinder_rbd_user = pick(getvar("::${variable_prefix}cinder_rbd_pool"),
+                          'cinder')
 
-  # The network type to configure for Quantum.
-  # See http://docs.openstack.org/grizzly/openstack-network/admin/content/use_cases.html
+  # The network type to configure for Quantum.  See
+  # http://docs.openstack.org/grizzly/openstack-network/admin/content/use_cases.html
   # Supported:
   # single-flat
   # provider-router
   # per-tenant-router (default)
-  $quantum_network_type = pick(getvar("::${variable_prefix}quantum_network_type"),"per-tenant-router")
+  $quantum_network_type = pick(getvar("::${variable_prefix}quantum_network_type"),
+                               'per-tenant-router')
 
   # The plugin to use with Quantum.
   # Supported:
   # linuxbridge
   # ovs (default)
-  $quantum_plugin = pick(getvar("::${variable_prefix}quantum_plugin"),"ovs")
+  $quantum_plugin = pick(getvar("::${variable_prefix}quantum_plugin"),
+                                'ovs')
 
   # The tenant network type to use with the Quantum ovs and linuxbridge plugins
   # Supported: gre (default), flat, vlan
-  $quantum_tenant_network_type = pick(getvar("::${variable_prefix}quantum_tenant_network_type"),'gre')
+  $quantum_tenant_network_type = pick(getvar("::${variable_prefix}quantum_tenant_network_type"),
+                                      'gre')
 
-  # The Quantum physical network name to define
-  $quantum_physnet = pick(getvar("::${variable_prefix}quantum_physnet"),'physnet1')
+  # The Quantum physical network name to define (ignored if
+  # tenant_network_type=='gre'
+  $quantum_physnet = pick(getvar("::${variable_prefix}quantum_physnet"),
+                          'physnet1')
 
-  # The network VLAN ranges to use with the Quantum ovs and linuxbridge plugins
-  # (ignored unless quantum_tenant_network_type == 'vlan')
-  $quantum_network_vlan_ranges = pick(getvar("::${variable_prefix}quantum_network_vlan_ranges"),"2000:3999")
+  # The network VLAN ranges to use with the Quantum ovs and
+  # linuxbridge plugins (ignored unless quantum_tenant_network_type ==
+  # 'vlan')
+  $quantum_network_vlan_ranges = pick(getvar("::${variable_prefix}quantum_network_vlan_ranges"),
+                                      '2000:3999')
 
   # The tunnel ID ranges to use with the Quantum ovs plugin, when in gre mode
   # (ignored unless quantum_tenant_network_type == 'gre')
-  $quantum_tunnel_id_ranges = pick(getvar("::${variable_prefix}quantum_tunnel_id_ranges"),"1:1000")
+  $quantum_tunnel_id_ranges = pick(getvar("::${variable_prefix}quantum_tunnel_id_ranges"),
+                                   '1:1000')
 
   # The Quantum integration bridge
   # Default: br-int (normally doesn't need to be changed)
-  $quantum_integration_bridge = pick(getvar("::${variable_prefix}quantum_integration_bridge"),'br-int')
+  $quantum_integration_bridge = pick(getvar("::${variable_prefix}quantum_integration_bridge"),
+                                     'br-int')
 
-  # The Quantum tunnel bridge (irrelevant unless $quantum_tenant_network_type=='gre')
+  # The Quantum tunnel bridge (irrelevant unless
+  # $quantum_tenant_network_type=='gre')
   # Default: br-tun (normally doesn't need to be changed)
-  $quantum_tunnel_bridge = pick(getvar("::${variable_prefix}quantum_tunnel_bridge"),'br-tun')
+  $quantum_tunnel_bridge = pick(getvar("::${variable_prefix}quantum_tunnel_bridge"),
+                                       'br-tun')
 
   # The Quantum external bridge
   # Default: br-ex (normally doesn't need to be changed)
-  $quantum_external_bridge = pick(getvar("::${variable_prefix}quantum_external_bridge"),'br-ex')
+  $quantum_external_bridge = pick(getvar("::${variable_prefix}quantum_external_bridge"),
+                                  'br-ex')
 
   # The interface over which to run your nodes' management network traffic.
   # Normally, this would be your primary network interface.
-  $nic_management = pick(getvar("::${variable_prefix}nic_management"),"eth0")
+  $nic_management = pick(getvar("::${variable_prefix}nic_management"),
+                         'eth0')
 
   # The interface over which to run your tenant guest traffic.
-  # This would be a secondary interface, present on your network node and compute nodes.
-  $nic_data = pick(getvar("::${variable_prefix}nic_data"),"eth1")
+  # This would be a secondary interface, present on your network node
+  # and compute nodes.
+  $nic_data = pick(getvar("::${variable_prefix}nic_data"),
+                   'eth1')
 
-  # The interface you use to connect to the public network.
-  # This interface would only be present on your network nodes, and possibly also
-  # on your API nodes if you wish to expose the API services publicly.
-  $nic_external = pick(getvar("::${variable_prefix}nic_external"),"eth2")
+  # The interface you use to connect to the public network.  This
+  # interface would only be present on your network nodes, and
+  # possibly also on your API nodes if you wish to expose the API
+  # services publicly.
+  $nic_external = pick(getvar("::${variable_prefix}nic_external"),
+                       'eth2')
 
-  # The Quantum router uuid (irrelevant unless $quantum_network_type=='provider_router')
+  # The Quantum router uuid (irrelevant unless
+  # $quantum_network_type=='provider_router')
   $quantum_router_id = getvar("::${variable_prefix}quantum_router_id")
 
-  # The Quantum external network uuid (irrelevant unless $quantum_network_type=='provider_router')
+  # The Quantum external network uuid (irrelevant unless
+  # $quantum_network_type=='provider_router')
   $quantum_gateway_external_network_id = getvar("::${variable_prefix}gateway_external_network_id")
 
   # The nova-compute backend driver.
   # Supported: libvirt (default), xenserver
-  $nova_compute_driver = pick(getvar("::${variable_prefix}nova_compute_driver"),'libvirt')
+  $nova_compute_driver = pick(getvar("::${variable_prefix}nova_compute_driver"),
+                              'libvirt')
 
-  # The hypervisor to use with libvirt (ignored unless nova_compute_driver==libvirt)
+  # The hypervisor to use with libvirt (ignored unless
+  # nova_compute_driver==libvirt)
   # Supported: kvm (default), qemu
-  $nova_compute_libvirt_type = pick(getvar("::${variable_prefix}nova_compute_libvirt_type"),'kvm')
+  $nova_compute_libvirt_type = pick(getvar("::${variable_prefix}nova_compute_libvirt_type"),
+                                    'kvm')
 
   # The XenAPI connection URL (ignored unless nova_compute_driver==xenserver)
   $xenapi_connection_url = getvar("::${variable_prefix}xenapi_connection_url")
@@ -178,5 +225,4 @@ class kickstack::params {
 
   # The XenAPI password (ignored unless nova_compute_driver==xenserver)
   $xenapi_connection_password = getvar("::${variable_prefix}xenapi_connection_password")
-
 }