--- a/materials/index.php	Mon Mar 09 08:08:44 2015 +0200
+++ b/materials/index.php	Mon Mar 09 09:39:26 2015 +0200
@@ -3,16 +3,6 @@
 $pageIndex = "index.php";
 require "msitegen.inc.php";
 require "materials.inc.php";
-$sortDirs = array("asc", "desc");
-
-// Horrible kludge
-$agent = $_SERVER["HTTP_USER_AGENT"];
-if (stristr($agent, "GoogleBot") !== FALSE)
-{
-  header("HTTP/1.1 403 Forbidden");
-  exit;
-}
-
 function stParseList($values, $pair)
 {
   $res = array();
@@ -84,21 +74,6 @@
 }
 
 
-// Sorting column
-$setSortColumn = intval(stGetRequestItem("s", 0, TRUE));
-$setSortDirection = substr(strtolower(stGetRequestItem("d", "", TRUE)), 0, 1) == "d";
-
-// Material column hiding
-$setHideColumns = stParseList(stGetRequestItem("h", FALSE, TRUE), FALSE);
-
-// Column filters
-$setAttrFilters = stParseList(stGetRequestItem("f", FALSE, TRUE), TRUE);
-
-// Material filters
-$setMatFilters = stParseList(stGetRequestItem("m", FALSE, TRUE), FALSE);
-$setEnableMatFilters = intval(stGetRequestItem("mf", 0, TRUE));
-
-
 function stGetTC($a, $column)
 {
   global $setSortColumn;
@@ -134,6 +109,35 @@
 }
 
 
+//
+// Actual code starts
+//
+$sortDirs = array("asc", "desc");
+
+// Horrible kludge
+$agent = $_SERVER["HTTP_USER_AGENT"];
+if (stristr($agent, "GoogleBot") !== FALSE)
+{
+  header("HTTP/1.1 403 Forbidden");
+  exit;
+}
+
+// Sorting column
+$setSortColumn = intval(stGetRequestItem("s", 0, TRUE));
+$setSortDirection = substr(strtolower(stGetRequestItem("d", "", TRUE)), 0, 1) == "d";
+
+// Material column hiding
+$setHideColumns = stParseList(stGetRequestItem("h", FALSE, TRUE), FALSE);
+
+// Column filters
+$setAttrFilters = stParseList(stGetRequestItem("f", FALSE, TRUE), TRUE);
+
+// Material filters
+$setMatFilters = stParseList(stGetRequestItem("m", FALSE, TRUE), FALSE);
+$setEnableMatFilters = intval(stGetRequestItem("mf", 0, TRUE));
+
+
+// Sort materials by selected column
 if ($setSortColumn <= 0 || $setSortColumn >= 18)
 {
   $setSortColumn = 0;
@@ -146,6 +150,7 @@
   uasort($matTable, "stSortMatFunc");
 
 
+// Print page header
 cmPrintPageHeader($pageTitle, "
  <meta name=\"robots\" content=\"nofollow\" />
  <style type=\"text/css\">
@@ -248,6 +253,9 @@
 </table>
 </form>
 <?
+//
+// List active filters
+//
 if (count($setAttrFilters) > 0)
 {
   $filters = array();
@@ -265,11 +273,16 @@
     "<a href=\"?".stGetURLStr($setAttrFilters, $setSortColumn, $setSortDirection, !$setEnableMatFilters, $setMatFilters).
     "\">[".($setEnableMatFilters ? "Deactivate" : "Activate")."]</a></p>\n";
 }
-?>
-<div class="matTable">
-<table class="matTable">
- <tr>
-<?
+
+
+//
+// Material table headers
+//
+echo
+  "<div class=\"matTable\">\n".
+  "<table class=\"matTable\">\n".
+  " <tr>\n";
+
 foreach ($transNameTable as $key => $value)
 {
   if ($key == 0 || !isset($setHideColumns[$key]))
@@ -292,8 +305,15 @@
 }
 echo " </tr>\n";
 
+
+//
+// Material data rows
+//
 foreach ($matTable as $key => $value)
 {
+  //
+  // Check what filters apply here
+  //
   $doShow = TRUE;
   foreach ($setAttrFilters as $fkey => $fval)
   if ($fval >= 0 && $value[$fkey] != $fval)
@@ -307,15 +327,15 @@
 
   if ($doShow)
   {
-    $col = 0;
-
-    // Material filter
+    // Create temporary filter list for material filter link
     $tmpFilters = $setMatFilters;
     if (isset($tmpFilters[$key]))
       unset($tmpFilters[$key]);
     else
       $tmpFilters[$key] = 1;
 
+    // First column is material name
+    $col = 0;
     echo
       " <tr>".stGetTC("td", $col++).
       "<a class=\"matToggle ".(isset($setMatFilters[$key]) ? "active" : "inactive").
@@ -323,7 +343,7 @@
       "\">".(isset($setMatFilters[$key]) ? "-" : "+")."</a>".
       "<a href=\"/mat/".urlencode($key)."\">".chentities($key)."</a>".
       "</td>";
-    
+
     foreach ($value as $kkey => $kvalue)
     {
       if (!isset($setHideColumns[$kkey + 1]))
@@ -342,7 +362,7 @@
         }
         else
         {
-          // A simple entry, just print it out
+          // Create temporary filter list for attribute filter link
           $tmpFilters = $setAttrFilters;
           if (isset($tmpFilters[$kkey]))
             unset($tmpFilters[$kkey]);