diff --git a/source_ad.module b/source_ad.module
index 40cee65..8c9b734 100644
--- a/source_ad.module
+++ b/source_ad.module
@@ -31,7 +31,7 @@ function source_ad_menu() {
  * @return mixed
  */
 function source_ad_config_form($form, &$form_state) {
-
+  // HTML comments.
   $form['source_ad_content'] = array(
     '#type' => 'textarea',
     '#title' => t('Your Ad'),
@@ -39,6 +39,7 @@ function source_ad_config_form($form, &$form_state) {
     '#description' => t('This text will be published in the source code of the front page. Please do not use HTML.') . '<br/>' .
       t('Leave this field blank to remove your ad.'),
   );
+  // HTTP headers.
   $form['source_ad_header'] = array(
     '#type' => 'fieldset',
     '#title' => t('HTTP response headers advertise'),
@@ -55,7 +56,6 @@ function source_ad_config_form($form, &$form_state) {
     '#default_value' => variable_get('source_ad_header_name', 0),
     '#description' => t('Name of HTTP header.'),
   );
-
   $form['source_ad_header']['header_value'] = array(
     '#type' => 'textfield',
     '#title' => t('Header value'),
@@ -82,22 +82,16 @@ function source_ad_config_form($form, &$form_state) {
 function source_ad_config_form_submit(&$form, &$form_state) {
 
   $content = htmlentities($form_state['values']['source_ad_content'], ENT_NOQUOTES, 'UTF-8');
-  $header_name = htmlentities($form_state['values']['header_name'], ENT_NOQUOTES, 'UTF-8');
+  $header_name = intval($form_state['values']['header_name']);
   $header_value = $form_state['values']['header_value'];
-  $options = array(SOURCE_AD_ADVERTISEMENT, SOURCE_AD_HACKER, SOURCE_AD_READ_ME);
-  if (!isset($options[$header_name])) {
-    $header_name = 0;
-  }
-  // Remove new lines. New line = New header.
+
+  // Remove new lines.
   $header_value = trim(preg_replace('/\s+/', ' ', $header_value));
   $header_value = _source_ad_convert_to_ascii($header_value, 'utf-8');
 
   // @todo: Convert -- to - -.
   variable_set('source_ad_content', $content);
-
-  if ($header_value) {
-    variable_set('source_ad_header_name', $header_name);
-  }
+  variable_set('source_ad_header_name', $header_name);
   variable_set('source_ad_header_value', $header_value);
 
   drupal_set_message(t('Successfully published.'));
@@ -139,6 +133,7 @@ function source_ad_preprocess_html(&$variables) {
  * Add ad to http headers.
  */
 function source_ad_boot() {
+
   $options = array(SOURCE_AD_ADVERTISEMENT, SOURCE_AD_HACKER, SOURCE_AD_READ_ME);
   $header_value = variable_get('source_ad_header_value', '');
   if (!empty($header_value)) {
@@ -148,11 +143,12 @@ function source_ad_boot() {
 
     // http://stackoverflow.com/a/4410331/2080076
     // Words of *TEXT MAY contain characters from character sets other than ISO-8859-1 only when encoded according to the rules of RFC 2047.
-    // and RFC 2047 is the MIME encoding, so it'd be: * =?UTF-8?Q?=E2=9C=B0?= .
+    // RFC 2047 is the MIME encoding, so it'd be: * =?UTF-8?Q?=E2=9C=B0?= .
 
     drupal_add_http_header($header_name, $header_value, FALSE);
   }
 }
+
 /**
  * Convert data to ASCII.
  *
