diff --git a/masonry_context/masonry_context.info b/masonry_context/masonry_context.info
index 5c4b2b8..446ffb9 100644
--- a/masonry_context/masonry_context.info
+++ b/masonry_context/masonry_context.info
@@ -3,5 +3,8 @@ description = "Provides a Context reacton plugin to display content in a jQuery
 core = 7.x
 package = User interface
 
+files[] = plugins/context_reaction_masonry.inc
+
 dependencies[] = masonry
 dependencies[] = context
+
diff --git a/masonry_context/masonry_context.module b/masonry_context/masonry_context.module
index 28e900c..9e737ab 100644
--- a/masonry_context/masonry_context.module
+++ b/masonry_context/masonry_context.module
@@ -1,6 +1,7 @@
 <?php
 /**
  * @file
+ * Provides a Context reacton plugin to display content in a jQuery Masonry grid.
  */
 
 /**
@@ -20,7 +21,7 @@ function masonry_context_context_plugins() {
 
   $plugins['context_reaction_masonry'] = array(
     'handler' => array(
-      'path' => drupal_get_path('module', 'masonry_context') . '/plugins',
+      'path' => drupal_get_path('module', 'masonry_context'),
       'file' => 'context_reaction_masonry.inc',
       'class' => 'context_reaction_masonry',
       'parent' => 'context_reaction',
@@ -43,3 +44,4 @@ function masonry_context_context_registry() {
     ),
   );
 }
+
--- context_reaction_masonry.inc.OLD	2013-02-02 23:46:43.000000000 +1100
+++ context_reaction_masonry.inc	2013-02-02 23:47:14.000000000 +1100
@@ -8,6 +8,7 @@
  * Adds Masonry javascript to the page.
  */
 class context_reaction_masonry extends context_reaction {
+
   /**
    * Masonry settings form.
    */
@@ -15,7 +16,7 @@ class context_reaction_masonry extends c
     $form = array();
     $settings = $this->fetch_from_context($context);
 
-    // Get default Masonry options.
+    // Get default Masonry options
     $settings += masonry_default_options();
 
     $form['container'] = array(
@@ -24,7 +25,6 @@ class context_reaction_masonry extends c
       '#default_value' => isset($settings['container']) ? $settings['container'] : NULL,
       '#description' => t('The jQuery selector of the Masonry container (ie, .region-content-inner).'),
     );
-
     $form['item'] = array(
       '#type' => 'textfield',
       '#title' => t('Item selector'),
@@ -32,7 +32,7 @@ class context_reaction_masonry extends c
       '#description' => t('The jQuery selector of the Masonry item container (ie, section).'),
     );
 
-    // Add Masonry options to an existing form.
+    // Add Masonry options to an existing form
     masonry_options_form($form, $settings);
 
     $form['masonry_animated_duration']['#states'] = array(
@@ -85,27 +85,27 @@ class context_reaction_masonry extends c
         }
 
         $script .= '
-  $("' . $settings['container'] . '").imagesLoaded(function() {
-    $("' . $settings['container'] . '").masonry({
-      itemSelector: "' . $settings['item'] . '",
-      columnWidth: ' . $column_width . ',
-      isAnimated: ' . $settings['masonry_animated'] . ',
-      animationOptions: {
-        duration: ' . (int) $settings['masonry_animated_duration'] . '
-      },
-      isResizable: ' . $settings['masonry_resizable'] . ',
-      isFitWidth: ' . $settings['masonry_center'] . ',
-      gutterWidth: ' . (int) $settings['masonry_gutter'] . ',
-      isRTL: ' . $settings['masonry_rtl'] . '
-    });
-  });
-';
+          $("' . $settings['container'] . '").imagesLoaded(function () {
+            $("' . $settings['container'] . '").masonry({
+              itemSelector: "' . $settings['item'] . '",
+              columnWidth: ' . $column_width . ',
+              isAnimated: ' . $settings['masonry_animated'] . ',
+              animationOptions: {
+                duration: ' . (int) $settings['masonry_animated_duration'] . '
+              },
+              isResizable: ' . $settings['masonry_resizable'] . ',
+              isFitWidth: ' . $settings['masonry_center'] . ',
+              gutterWidth: ' . (int) $settings['masonry_gutter'] . ',
+              isRTL: ' . $settings['masonry_rtl'] . '
+            });
+          });
+        ';
       }
     }
 
     // Initialize Masonry
     if (!empty($script) && ($library = libraries_load('masonry')) && !empty($library['loaded'])) {
-      $script = '(function ($) { ' . $script . '})(jQuery);';
+      $script = '(function ($) { ' . $script . ' })(jQuery);';
       drupal_add_css($styles, 'inline');
       drupal_add_js($script, array(
         'type' => 'inline',
@@ -114,3 +114,4 @@ class context_reaction_masonry extends c
     }
   }
 }
+