diff --git a/README.txt b/README.txt
index 1f02e00..0e03650 100644
--- a/README.txt
+++ b/README.txt
@@ -1,8 +1,10 @@
 -- SUMMARY --
 
-Simple module that provides a block with the latest updates from Facebook for the provided account. It is based on the
-likebox social plugin: http://developers.facebook.com/docs/reference/plugins/like-box/
-The widget settings are configurable for users with 'admin facebook widget settings' permission
+Simple module that provides a block with the latest updates from Facebook for
+the provided account. It is based on the likebox social plugin:
+http://developers.facebook.com/docs/reference/plugins/like-box. The widget
+settings are configurable for users with 'admin facebook widget settings'
+permission.
 
 
 -- REQUIREMENTS --
@@ -19,29 +21,29 @@ The widget settings are configurable for users with 'admin facebook widget setti
 
 * Go to Administer > Site configuration > Facebook Likebox Settings and
 
- - Add the Facebook Page (i.e.: http://www.facebook.com/wikisaber.es) and 
+ - Add the Facebook Page (i.e.: http://www.facebook.com/wikisaber.es) and
    configure the display and appearance settings.
-   
+
  - Configuration examples:
- 
+
  -- A) Faces and stream (default)
  --- Show Stream: Yes
  --- Show Faces: Yes
  --- Height: 556
- 
+
  -- B) Without Faces
  --- Show Stream: Yes
  --- Show Faces: No
  --- Height: 292
- 
+
  -- C) Without Stream and Faces
  --- Show Stream: No
  --- Show Faces: No
  --- Scrollling: Disabled
  --- Height: 63
- 
+
 * Add the block "'Your site name' on Facebook" to a region.
 
 -- CONTACT --
 
-david.rozas@gmail.com
\ No newline at end of file
+david.rozas@gmail.com
diff --git a/fb_likebox.admin.inc b/fb_likebox.admin.inc
index 44673a3..2feb5d7 100644
--- a/fb_likebox.admin.inc
+++ b/fb_likebox.admin.inc
@@ -1,17 +1,15 @@
 <?php
+
 /**
  * @file
  * Administration page callbacks
- *
  */
 
 /**
- *
- * Implementation of hook_admin_settings().
- *
+ * Implements hook_admin_settings().
  */
 function fb_likebox_admin_settings() {
-  //Facebook Widget settings
+  // Facebook Widget settings.
   $form['fb_likebox_display_settings'] = array(
     '#type' => 'fieldset',
     '#title' => t('Display options'),
@@ -23,7 +21,7 @@ function fb_likebox_admin_settings() {
     '#collapsible' => FALSE,
   );
 
-  //Display settings
+  // Display settings.
   $form['fb_likebox_display_settings']['fb_likebox_url'] = array(
     '#type' => 'textfield',
     '#title' => t('Facebook Page URL'),
@@ -36,8 +34,9 @@ function fb_likebox_admin_settings() {
     '#default_value' => variable_get('fb_likebox_colorscheme', 'light'),
     '#options' => array(
       'light' => t('Light'),
-      'dark' => t('Dark')),
-    '#description' => t('The color scheme for the plugin. Options: \'light\', \'dark\''),
+      'dark' => t('Dark'),
+    ),
+    '#description' => t("The color scheme for the plugin. Options: 'light', 'dark'"),
   );
   $form['fb_likebox_display_settings']['fb_likebox_header'] = array(
     '#type' => 'select',
@@ -45,7 +44,8 @@ function fb_likebox_admin_settings() {
     '#default_value' => variable_get('fb_likebox_header', 'true'),
     '#options' => array(
       'false' => t('No'),
-      'true' => t('Yes')),
+      'true' => t('Yes'),
+    ),
     '#description' => t('Specifies whether to display the Facebook header at the top of the plugin'),
   );
   $form['fb_likebox_display_settings']['fb_likebox_stream'] = array(
@@ -54,8 +54,9 @@ function fb_likebox_admin_settings() {
     '#default_value' => variable_get('fb_likebox_stream', 'true'),
     '#options' => array(
       'false' => t('No'),
-      'true' => t('Yes')),
-    '#description' => t('Specifies whether to display a stream of the latest posts from the Page\'s wall'),
+      'true' => t('Yes'),
+    ),
+    '#description' => t("Specifies whether to display a stream of the latest posts from the Page's wall"),
   );
   $form['fb_likebox_display_settings']['fb_likebox_show_faces'] = array(
     '#type' => 'select',
@@ -63,7 +64,8 @@ function fb_likebox_admin_settings() {
     '#default_value' => variable_get('fb_likebox_show_faces', 'true'),
     '#options' => array(
       'false' => t('No'),
-      'true' => t('Yes')),
+      'true' => t('Yes'),
+    ),
     '#description' => t('Specifies whether or not to display profile photos in the plugin.'),
   );
   $form['fb_likebox_display_settings']['fb_likebox_scrolling'] = array(
@@ -72,11 +74,12 @@ function fb_likebox_admin_settings() {
     '#default_value' => variable_get('fb_likebox_scrolling', 'no'),
     '#options' => array(
       'no' => t('Disabled'),
-      'yes' => t('Enabled')),
+      'yes' => t('Enabled'),
+    ),
     '#description' => t('Enables vertical scrolling'),
   );
 
-  //Theming settings
+  // Theming settings.
   $form['fb_likebox_theming_settings']['fb_likebox_width'] = array(
     '#type' => 'textfield',
     '#title' => t('Width'),
@@ -87,39 +90,31 @@ function fb_likebox_admin_settings() {
     '#type' => 'textfield',
     '#title' => t('Height'),
     '#default_value' => variable_get('fb_likebox_height', '556'),
-    '#description' => t('The height of the plugin in pixels. The default height provided by Facebook API varies
-      based on number of faces to display, and whether the stream is displayed.
-      With the stream displayed, and 10 faces the default height is 556px.
-      With no faces, and no stream the default height is 63px.
-      You will need to play with these value if you haved disabled those features and you
-      want the block to be displayed without an empty section.'),
+    '#description' => t('The height of the plugin in pixels. The default height provided by Facebook API varies based on number of faces to display, and whether the stream is displayed. With the stream displayed, and 10 faces the default height is 556px. With no faces, and no stream the default height is 63px. You will need to play with these value if you haved disabled those features and you want the block to be displayed without an empty section.'),
   );
   return system_settings_form($form);
 }
 
 /**
- *
  * Validates the Facebook Widget admin configuration form.
  *
- * It will be called automatically by drupal after processing the form
- *
+ * It will be called automatically by drupal after processing the form.
  */
 function fb_likebox_admin_settings_validate($form, $form_state) {
-
-  //Facebook display settings validation
+  // Facebook display settings validation.
   $fb_url = $form_state['values']['fb_likebox_url'];
   if (!valid_url($fb_url, TRUE)) {
     form_set_error('fb_likebox_url', t('Please enter a valid url'));
   }
 
-  //Facebook theming settings validation
+  // Facebook theming settings validation.
   $fb_width = $form_state['values']['fb_likebox_width'];
-  if (!is_numeric($fb_width)|| intval($fb_width)<=0) {
+  if (!is_numeric($fb_width) || intval($fb_width) <= 0) {
     form_set_error('fb_likebox_width', t('Width should be a number bigger than 0'));
   }
 
   $fb_height = $form_state['values']['fb_likebox_height'];
-  if (!is_numeric($fb_height) || intval($fb_height)<=0) {
-    form_set_error('fb_likebox_height', t('Height should be a  number bigger than 0'));
+  if (!is_numeric($fb_height) || intval($fb_height) <= 0) {
+    form_set_error('fb_likebox_height', t('Height should be a number bigger than 0'));
   }
-}
\ No newline at end of file
+}
diff --git a/fb_likebox.info b/fb_likebox.info
index 0c8ce09..e590567 100644
--- a/fb_likebox.info
+++ b/fb_likebox.info
@@ -1,4 +1,3 @@
 name = Facebook Likebox
-description = "Simple module that provides a configurable block with Facebook Likebox's plugin"
+description = Simple module that provides a configurable block with Facebook Likebox's plugin.
 core = 6.x
-package = Facebook
\ No newline at end of file
diff --git a/fb_likebox.module b/fb_likebox.module
index 63abf46..762e8e9 100644
--- a/fb_likebox.module
+++ b/fb_likebox.module
@@ -1,17 +1,21 @@
 <?php
+
 /**
+ * @file
+ * @todo.
+ */
+
+/**
+ * Implements hook_perm().
  *
- * Implementation of hook_perm().
- *
- * Defines a set of permissions available related to the facebook widget functionalities
+ * Defines permissions available related to the facebook widget functionalities.
  */
 function fb_likebox_perm() {
   return array('admin facebook likebox settings');
 }
 
 /**
- * Implementation of hook_menu().
- *
+ * Implements hook_menu().
  */
 function fb_likebox_menu() {
   $items['admin/settings/fb-likebox'] = array(
@@ -26,27 +30,22 @@ function fb_likebox_menu() {
   return $items;
 }
 
-
 /**
- *
- * Implementation of hook_block().
- *
- * @param $op   Defines the phases the block go through.
- * @param $delta    Id of the block to return
- * @param $edit When $op is save, contains the submitted form data from the block configuration form.
+ * Implements hook_block().
  */
 function fb_likebox_block($op = 'list', $delta = 0, $edit = array()) {
   switch ($op) {
     case 'list':
       $site_name = variable_get('site_name', 'Default site name');
       $blocks[0]['info'] = check_plain($site_name . ' ' . t('on Facebook'));
-      //We set not to get a cache of this block
+      // We set not to get a cache of this block.
       $blocks[0]['cache'] = BLOCK_NO_CACHE;
       return $blocks;
+
     case 'view':
       switch ($delta) {
         case 0:
-          //Get the values given in the admin form
+          // Get the values given in the admin form.
           $fb_url = check_url(variable_get('fb_likebox_url', 'http://www.facebook.com/wikisaber.es'));
           $fb_colorscheme = check_plain(variable_get('fb_likebox_colorscheme', 'light'));
           $fb_header = check_plain(variable_get('fb_likebox_header', 'true'));
@@ -56,33 +55,36 @@ function fb_likebox_block($op = 'list', $delta = 0, $edit = array()) {
           $fb_width = check_plain(variable_get('fb_likebox_width', '292'));
           $fb_height = check_plain(variable_get('fb_likebox_height', '556'));
 
-          //Set the subject of the block (title to be displayed to the users)
+          // Set the subject of the block (title to be displayed to the users).
           $site_name = variable_get('site_name', 'Default site name');
           $blocks[0]['info'] = check_plain($site_name . ' ' . t('on Facebook'));
 
-          //Call to the theming function
-          $block['content'] = theme('fb_likebox_facebook', $fb_url, $fb_colorscheme, $fb_header, $fb_stream, $fb_show_faces,
-          $fb_scrolling, $fb_width, $fb_height);
+          // Call to the theming function.
+          $block['content'] = theme('fb_likebox_facebook', $fb_url, $fb_colorscheme, $fb_header, $fb_stream, $fb_show_faces, $fb_scrolling, $fb_width, $fb_height);
           return $block;
-          break;
       }
       break;
   }
 }
 
 /**
- *
- * Implementation of hook_theme().
- *
+ * Implements hook_theme().
  */
-function fb_likebox_theme() {
-  $path = drupal_get_path('module', 'fb_likebox');
-  return array
-  ('fb_likebox_facebook' => array(
-     'arguments' => array('fb_url' => NULL, 'fb_colorscheme' => NULL, 'fb_header' => NULL, 'fb_stream' => NULL,
-     'fb_show_faces' => NULL, 'fb_scrolling' => NULL, 'fb_width' => NULL, 'fb_height' => NULL, ),
-   'path' => $path . '/templates',
-   'template' => 'fb_likebox',
-   ''),
+function fb_likebox_theme($existing, $type, $theme, $path) {
+  return array(
+    'fb_likebox_facebook' => array(
+      'arguments' => array(
+        'fb_url' => NULL,
+        'fb_colorscheme' => NULL,
+        'fb_header' => NULL,
+        'fb_stream' => NULL,
+        'fb_show_faces' => NULL,
+        'fb_scrolling' => NULL,
+        'fb_width' => NULL,
+        'fb_height' => NULL,
+      ),
+      'path' => $path . '/templates',
+      'template' => 'fb_likebox',
+    ),
   );
-}
\ No newline at end of file
+}
diff --git a/templates/fb_likebox.tpl.php b/templates/fb_likebox.tpl.php
index 3aa7c8a..8f81b1c 100644
--- a/templates/fb_likebox.tpl.php
+++ b/templates/fb_likebox.tpl.php
@@ -1,14 +1,15 @@
 <?php
+
 /**
  * @file
  * Facebook Likebox Template.
- *
  */
 ?>
+
 <iframe
-src="http://www.facebook.com/plugins/likebox.php?href=<?php echo $fb_url ?>&width=<?php echo $fb_width ?>&colorscheme=<?php echo $fb_colorscheme ?>&show_faces=<?php echo $fb_show_faces ?>&bordercolor&stream=<?php echo $fb_stream ?>&header=<?php echo $fb_header ?>&height=<?php echo $fb_height ?>"
-scrolling="<?php echo $fb_scrolling ?>"
+src="http://www.facebook.com/plugins/likebox.php?href=<?php echo $fb_url; ?>&width=<?php echo $fb_width; ?>&colorscheme=<?php echo $fb_colorscheme; ?>&show_faces=<?php echo $fb_show_faces; ?>&bordercolor&stream=<?php echo $fb_stream; ?>&header=<?php echo $fb_header; ?>&height=<?php echo $fb_height; ?>"
+scrolling="<?php echo $fb_scrolling; ?>"
 frameborder="0"
-style="border:none; overflow:hidden; width:<?php echo $facebook_width ?>px; height:<?php echo $fb_height ?>px;"
+style="border: none; overflow: hidden; width: <?php echo $facebook_width; ?>px; height: <?php echo $fb_height; ?>px;"
 allowTransparency="true">
-</iframe>
\ No newline at end of file
+</iframe>