diff --git a/block_submit.info b/block_submit.info
index c277fd2..02e632c 100644
--- a/block_submit.info
+++ b/block_submit.info
@@ -3,8 +3,5 @@ description = This module blocks users from accidentally submitting a form twice
 core = 7.x
 tags[] = content
 
-files[] = block_submit.module
-files[] = block_submit.js
-
-version = "7.x-1.0"
 core = "7.x"
+configure = admin/config/user-interface/block_submit
diff --git a/block_submit.js b/block_submit.js
index f4f6da8..1ab9a64 100644
--- a/block_submit.js
+++ b/block_submit.js
@@ -1,5 +1,7 @@
 (function ($) {
-  $(document).ready(function() {
+
+Drupal.behaviors.blockSubmitBlockit = {
+  attach: function(context) {
     $('form').each(function (i) {
       var form = $(this);
       $('input.form-submit', form).click(function (e) {
@@ -22,7 +24,7 @@
           }
           inp = $(this);
         });
-      
+
         if (inp && settings.block_submit_atext) {
           inp.after('<span>' + settings.block_submit_atext + '</span>');
         }
@@ -39,5 +41,8 @@
       }
       return true;
     });
-  }); 
-})(jQuery);
\ No newline at end of file
+  }
+};
+
+})(jQuery);
+
diff --git a/block_submit.module b/block_submit.module
index 2db3952..2096260 100644
--- a/block_submit.module
+++ b/block_submit.module
@@ -1,15 +1,15 @@
 <?php
 
 /**
-* @file
-* This module blocks users from accidentally submitting a form twice. It uses jQuery.
-*
-* Created by Alexandru Badiu (andu@ctrlz.ro).
-*/
+ * @file
+ * This module blocks users from accidentally submitting a form twice. It uses jQuery.
+ *
+ * Created by Alexandru Badiu (andu@ctrlz.ro).
+ */
 
 /**
-* Implementation of hook_init().
-*/
+ * Implements hook_init().
+ */
 function block_submit_init() {
   $block_submit_settings = array( 'block_submit' => array(
     'block_submit_method' => variable_get('block_submit_method', 'disable'),
@@ -18,7 +18,7 @@ function block_submit_init() {
     'block_submit_atext' => t(variable_get('block_submit_atext', '')),
     'block_submit_hide_css' => variable_get('block_submit_hide_css', 'block-submit-processing'),
     'block_submit_hide_text' => t(variable_get('block_submit_hide_text', 'Processing...')),
-    'block_submit_hide_fx' => t(variable_get('block_submit_hide_fx', false)),
+    'block_submit_hide_fx' => t(variable_get('block_submit_hide_fx', FALSE)),
   ));
 
   drupal_add_js($block_submit_settings, 'setting');
@@ -27,14 +27,14 @@ function block_submit_init() {
 }
 
 /**
-* Implementation of hook_menu().
-*/
+ * Implements hook_menu().
+ */
 function block_submit_menu() {
   $items = array();
 
   $items['admin/config/user-interface/block_submit'] = array(
-    'title' => t('Block submit settings'),
-    'description' => t('Change the blocking settings.'),
+    'title' => 'Block submit settings',
+    'description' => 'Change the form submit blocking settings.',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('block_submit_settings'),
     'access arguments' => array('administer site configuration'),
@@ -45,11 +45,11 @@ function block_submit_menu() {
 }
 
 /**
-* Form builder. Configure block submit settings.
-*
-* @ingroup forms
-* @see system_settings_form().
-*/
+ * Form builder. Configure block submit settings.
+ *
+ * @ingroup forms
+ * @see system_settings_form()
+ */
 function block_submit_settings() {
   $form = array();
 
@@ -64,8 +64,8 @@ function block_submit_settings() {
   $form['block_submit_disable'] = array(
     '#type' => 'fieldset',
     '#title' => t('Disabling settings'),
-    '#collapsible' => true,
-    '#collapsed' => false,
+    '#collapsible' => TRUE,
+    '#collapsed' => FALSE,
   );
 
   $form['block_submit_disable']['block_submit_css'] = array(
@@ -92,30 +92,30 @@ function block_submit_settings() {
   $form['block_submit_hide'] = array(
     '#type' => 'fieldset',
     '#title' => t('Hiding settings'),
-    '#collapsible' => true,
-    '#collapsed' => false,
+    '#collapsible' => TRUE,
+    '#collapsed' => FALSE,
   );
 
   $form['block_submit_hide']['block_submit_hide_fx'] = array(
-     '#type' => 'checkbox',
-     '#title' => t('Use effects?'),
-     '#default_value' => variable_get('block_submit_hide_fx', false),
-     '#description' => t('Enabling this will use a fade in / out effect.'),
-   );
+    '#type' => 'checkbox',
+    '#title' => t('Use effects?'),
+    '#default_value' => variable_get('block_submit_hide_fx', FALSE),
+    '#description' => t('Enabling this will use a fade in / out effect.'),
+  );
 
   $form['block_submit_hide']['block_submit_hide_css'] = array(
-     '#type' => 'textfield',
-     '#title' => t('Css class'),
-     '#default_value' => variable_get('block_submit_hide_css', 'block-submit-processing'),
-     '#description' => t('This css class will be added to the div which is shown instead of the submit buttons.'),
-   );
-
-   $form['block_submit_hide']['block_submit_hide_text'] = array(
-     '#type' => 'textfield',
-     '#title' => t('Processing text'),
-     '#default_value' => variable_get('block_submit_hide_text', 'Processing...'),
-     '#description' => t('This text will be shown to the user instead of the submit buttons.'),
-   );
+    '#type' => 'textfield',
+    '#title' => t('Css class'),
+    '#default_value' => variable_get('block_submit_hide_css', 'block-submit-processing'),
+    '#description' => t('This css class will be added to the div which is shown instead of the submit buttons.'),
+  );
+
+  $form['block_submit_hide']['block_submit_hide_text'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Processing text'),
+    '#default_value' => variable_get('block_submit_hide_text', 'Processing...'),
+    '#description' => t('This text will be shown to the user instead of the submit buttons.'),
+  );
 
   return system_settings_form($form);
 }