diff --git sort_comments.module sort_comments.module
index 1beef0d..d55d98a 100644
--- sort_comments.module
+++ sort_comments.module
@@ -2,26 +2,31 @@
 /* drupal@ganovelli.it - blackice78 */
 define('SORT_COMMENTS_OLDER_FIRST', 1); // default
 define('SORT_COMMENTS_NEWER_FIRST', 2);
-/* Alter node type form: allow user to decide comments sorting */
+
+/**
+ * Implementation of hook_form_FORM_ID_alter
+ * Alter node type form: allow user to decide comments sorting
+ **/
 function sort_comments_form_node_type_form_alter(&$form, $form_state) {
   $form['comment']['comment_default_sorting'] = array(
      '#title' => t('Sort'),
      '#type' => 'select',
      '#options' => array(1 => t('Older first'), 
                          2 => t('Newer first')),
-     '#default_value' => variable_get('sort_comments_' . $form['#node_type']->type, SORT_COMMENTS_OLDER_FIRST), 
+     '#default_value' => variable_get('comment_default_sorting_' . $form['#node_type']->type, SORT_COMMENTS_OLDER_FIRST), 
   );
-  $form['#submit'][]='sort_comments_form_node_type_form_submit';
 }
-function sort_comments_form_node_type_form_submit($form, &$form_state) {
-  variable_set('sort_comments_' . $form['#node_type']->type, $form_state['values']['comment_default_sorting']);
-}
-/* Alter comments query */
-function sort_comments_query_comment_filter_alter(QueryAlterableInterface $query){
+
+/**
+ * Implementation of hook_query_TAG_alter
+ * Alter comments query to add new orderby
+ **/
+function sort_comments_query_comment_filter_alter($query){
   if ( ($node = $query->getMetaData('node')) && (get_class($query) == 'PagerDefault') ) {
-    $sort = variable_get('sort_comments_' . $node->type, SORT_COMMENTS_OLDER_FIRST);
+    $sort = variable_get('comment_default_sorting_' . $node->type, SORT_COMMENTS_OLDER_FIRST);
       if ($sort == SORT_COMMENTS_NEWER_FIRST) {
-      $orderby =& $query->getOrderBy();  
+      $orderby =& $query->getOrderBy();
+      //dpm($orderby);
       $expressions =& $query->getExpressions();
       if (isset($orderby['torder'])) { 
           unset($expressions['torder']);