diff --git a/system/form.php b/system/form.php
index 85335d38..d4264636 100644
--- a/system/form.php
+++ b/system/form.php
@@ -464,13 +464,12 @@ public static function select($name, $options = array(), $selected = null, $attr
 
 		$html_options = array();
 
+		// -------------------------------------------------------
+		// Build the HTML options for the drop-down.
+		// -------------------------------------------------------
 		foreach ($options as $value => $display)
 		{
-			$option_attributes = array();
-
-			$option_attributes['value'] = HTML::entities($value);
-			$option_attributes['selected'] = ($value == $selected) ? 'selected' : null;
-
+			$option_attributes = array('value' => HTML::entities($value), 'selected' => ($value == $selected) ? 'selected' : null);
 			$html_options[] = '<option'.HTML::attributes($option_attributes).'>'.HTML::entities($display).'</option>';
 		}