diff --git a/smtp.install b/smtp.install
index 2a68650..da7b5f3 100644
--- a/smtp.install
+++ b/smtp.install
@@ -6,18 +6,14 @@
  */
 
 /**
- * Implementation of hook_install().
+ * Implements hook_install().
  */
  function smtp_install() {
    variable_set('smtp_on', 0);
  }
-/**
- * @file
- * The uninstallation instructions for the SMTP Authentication Support.
- */
 
 /**
- * Implementation of hook_uninstall().
+ * Implements hook_uninstall().
  */
 function smtp_uninstall() {
   variable_del('smtp_from');
@@ -34,20 +30,30 @@ function smtp_uninstall() {
   if (variable_get('smtp_library', '') == drupal_get_path('module', 'smtp') . '/smtp.module') {
     variable_del('smtp_library');
   }
-}  //  End of contact_attach_uninstall().
+}
 
+/**
+ * Implements hook_enable().
+ */
 function smtp_enable() {
   $mail_modes = variable_get('mail_system', array('default-system' => 'DefaultMailSystem'));
   $mail_modes['default-system'] = 'SmtpMailSystem';
   variable_set('mail_system', $mail_modes);
 }
 
+/**
+ * Implements hook_disable().
+ */
 function smtp_disable() {
   $mail_modes = variable_get('mail_system');
   $mail_modes['default-system'] = 'DefaultMailSystem';
   variable_set('mail_system', $mail_modes);
 }
 
+/**
+ * Implements hook_update_N().
+ * Upgrade to Drupal 7.x
+ */
 function smtp_update_7000() {
   if (variable_get('smtp_on', 0) != 0) {
     variable_set('mail_system', array('default-system' => 'SmtpMailSystem'));
diff --git a/smtp.module b/smtp.module
index 8527d83..309a409 100644
--- a/smtp.module
+++ b/smtp.module
@@ -16,7 +16,7 @@
  */
 
 /**
- * Implementation of hook_help().
+ * Implements hook_help().
  */
 function smtp_help($path, $arg) {
   switch ($path) {
@@ -26,7 +26,7 @@ function smtp_help($path, $arg) {
 }  //  End of smtp_help().
 
 /**
- * Implementation of hook_menu().
+ * Implements hook_menu().
  */
 function smtp_menu() {
   $items['admin/config/system/smtp'] = array(
@@ -41,7 +41,7 @@ function smtp_menu() {
 }  //  End of smtp_menu().
 
 /**
- * Implementation of hook_permission().
+ * Implements hook_permission().
  */
 function smtp_permission() {
   return array(
@@ -53,7 +53,7 @@ function smtp_permission() {
 
 
 /**
- * Implementation of hook_mail().
+ * Implements hook_mail().
  */
 function smtp_mail($key, &$message, $params) {
   if ($key == 'smtp-test') {