diff --git a/mod/quiz/backuplib.php b/mod/quiz/backuplib.php
index 202bb166d1c..f4d03eb8cef 100644
--- a/mod/quiz/backuplib.php
+++ b/mod/quiz/backuplib.php
@@ -1,4 +1,4 @@
-<?php //$Id$
+<?php // $Id$
     //This php script contains all the stuff to backup quizzes
 
 //This is the "graphical" structure of the quiz mod:
diff --git a/mod/quiz/db/upgrade.php b/mod/quiz/db/upgrade.php
index aaa42c1d0ba..4cff3d89d1c 100644
--- a/mod/quiz/db/upgrade.php
+++ b/mod/quiz/db/upgrade.php
@@ -1,4 +1,4 @@
-<?php  //$Id$
+<?php  // $Id$
 
 // This file keeps track of upgrades to
 // the quiz module
diff --git a/mod/quiz/restorelib.php b/mod/quiz/restorelib.php
index e9e7de6857b..80cf0c3708b 100644
--- a/mod/quiz/restorelib.php
+++ b/mod/quiz/restorelib.php
@@ -1,4 +1,4 @@
-<?php //$Id$
+<?php // $Id$
     //This php script contains all the stuff to restore quiz mods
 
 // Todo:
diff --git a/mod/quiz/restorelibpre15.php b/mod/quiz/restorelibpre15.php
index 68b1c5b3ee9..4fcb8756cce 100644
--- a/mod/quiz/restorelibpre15.php
+++ b/mod/quiz/restorelibpre15.php
@@ -1,4 +1,4 @@
-<?php //$Id$
+<?php // $Id$
     //This php script contains all the stuff to backup/restore
     //quiz mods
 
diff --git a/question/backuplib.php b/question/backuplib.php
index 686cc80de4d..a6fb5655b44 100644
--- a/question/backuplib.php
+++ b/question/backuplib.php
@@ -1,4 +1,4 @@
-<?php //$Id$
+<?php // $Id$
 /**
  * Question bank backup code.
  *
diff --git a/question/category_form.php b/question/category_form.php
index bb772bc40dc..b195b7130fe 100644
--- a/question/category_form.php
+++ b/question/category_form.php
@@ -1,4 +1,4 @@
-<?php  //$Id$
+<?php  // $Id$
 
 require_once($CFG->libdir.'/formslib.php');
 
diff --git a/question/contextmove_form.php b/question/contextmove_form.php
index c732d586104..a269381d054 100644
--- a/question/contextmove_form.php
+++ b/question/contextmove_form.php
@@ -1,4 +1,4 @@
-<?php  //$Id$
+<?php  // $Id$
 
 require_once($CFG->libdir.'/formslib.php');
 
diff --git a/question/contextmoveq_form.php b/question/contextmoveq_form.php
index 6617b870e10..857bfb2b085 100644
--- a/question/contextmoveq_form.php
+++ b/question/contextmoveq_form.php
@@ -1,4 +1,4 @@
-<?php  //$Id$
+<?php  // $Id$
 
 require_once($CFG->libdir.'/formslib.php');
 
diff --git a/question/export_form.php b/question/export_form.php
index 785906abf51..e7c6c56fa82 100644
--- a/question/export_form.php
+++ b/question/export_form.php
@@ -1,4 +1,4 @@
-<?php  //$Id$
+<?php  // $Id$
 
 require_once($CFG->libdir.'/formslib.php');
 
diff --git a/question/format/qti2/custommediafilter.php b/question/format/qti2/custommediafilter.php
index 8dcc4e15f4c..5144fcf0755 100644
--- a/question/format/qti2/custommediafilter.php
+++ b/question/format/qti2/custommediafilter.php
@@ -1,4 +1,4 @@
-<?php // $id$
+<?php // $Id$
 
 // note: modified from the original filter/mediaplugin/filter.php
 
diff --git a/question/import_form.php b/question/import_form.php
index 6980078adf8..bba5e3cec12 100644
--- a/question/import_form.php
+++ b/question/import_form.php
@@ -1,4 +1,4 @@
-<?php  //$Id$
+<?php  // $Id$
 
 require_once($CFG->libdir.'/formslib.php');
 
diff --git a/question/move_form.php b/question/move_form.php
index 72fdc3e9165..331a509ff74 100644
--- a/question/move_form.php
+++ b/question/move_form.php
@@ -1,4 +1,4 @@
-<?php  //$Id$
+<?php  // $Id$
 
 require_once($CFG->libdir.'/formslib.php');
 
diff --git a/question/restorelib.php b/question/restorelib.php
index 72f88e28ef1..aaf15a8815c 100644
--- a/question/restorelib.php
+++ b/question/restorelib.php
@@ -1,4 +1,4 @@
-<?php //$Id$
+<?php // $Id$
 /**
  * Question bank restore code.
  *
diff --git a/question/type/calculated/db/mysql.php b/question/type/calculated/db/mysql.php
index 0ab573ddedf..5ad1befa762 100644
--- a/question/type/calculated/db/mysql.php
+++ b/question/type/calculated/db/mysql.php
@@ -1,4 +1,4 @@
-<?php  //$Id$
+<?php  // $Id$
 
 // THIS FILE IS DEPRECATED!  PLEASE DO NOT MAKE CHANGES TO IT!
 //
diff --git a/question/type/calculated/db/postgres7.php b/question/type/calculated/db/postgres7.php
index cef79b084b9..a06ccbceafb 100644
--- a/question/type/calculated/db/postgres7.php
+++ b/question/type/calculated/db/postgres7.php
@@ -1,4 +1,4 @@
-<?php  //$Id$
+<?php  // $Id$
 
 // THIS FILE IS DEPRECATED!  PLEASE DO NOT MAKE CHANGES TO IT!
 //
diff --git a/question/type/calculated/db/upgrade.php b/question/type/calculated/db/upgrade.php
index d0bad669520..76289e8a5a8 100644
--- a/question/type/calculated/db/upgrade.php
+++ b/question/type/calculated/db/upgrade.php
@@ -1,4 +1,4 @@
-<?php  //$Id$
+<?php  // $Id$
 
 // This file keeps track of upgrades to 
 // the calculated qtype plugin
diff --git a/question/type/essay/db/mysql.php b/question/type/essay/db/mysql.php
index d0845a512fd..5a00788e95f 100644
--- a/question/type/essay/db/mysql.php
+++ b/question/type/essay/db/mysql.php
@@ -1,4 +1,4 @@
-<?php  //$Id$
+<?php  // $Id$
 
 // THIS FILE IS DEPRECATED!  PLEASE DO NOT MAKE CHANGES TO IT!
 //
diff --git a/question/type/essay/db/postgres7.php b/question/type/essay/db/postgres7.php
index c9565cf4c7f..6137345efbb 100644
--- a/question/type/essay/db/postgres7.php
+++ b/question/type/essay/db/postgres7.php
@@ -1,4 +1,4 @@
-<?php  //$Id$
+<?php  // $Id$
 
 // THIS FILE IS DEPRECATED!  PLEASE DO NOT MAKE CHANGES TO IT!
 //
diff --git a/question/type/essay/db/upgrade.php b/question/type/essay/db/upgrade.php
index cdc06e6be53..97fa3636088 100644
--- a/question/type/essay/db/upgrade.php
+++ b/question/type/essay/db/upgrade.php
@@ -1,4 +1,4 @@
-<?php  //$Id$
+<?php  // $Id$
 
 // This file keeps track of upgrades to 
 // the essay qtype plugin
diff --git a/question/type/match/db/mysql.php b/question/type/match/db/mysql.php
index 601398a9f11..7f48be5449a 100644
--- a/question/type/match/db/mysql.php
+++ b/question/type/match/db/mysql.php
@@ -1,4 +1,4 @@
-<?php  //$Id$
+<?php  // $Id$
 
 // THIS FILE IS DEPRECATED!  PLEASE DO NOT MAKE CHANGES TO IT!
 //
diff --git a/question/type/match/db/postgres7.php b/question/type/match/db/postgres7.php
index 060a5dce1fd..295cbca8b98 100644
--- a/question/type/match/db/postgres7.php
+++ b/question/type/match/db/postgres7.php
@@ -1,4 +1,4 @@
-<?php  //$Id$
+<?php  // $Id$
 
 // THIS FILE IS DEPRECATED!  PLEASE DO NOT MAKE CHANGES TO IT!
 //
diff --git a/question/type/match/db/upgrade.php b/question/type/match/db/upgrade.php
index 39848f064a7..a6d153b3f76 100644
--- a/question/type/match/db/upgrade.php
+++ b/question/type/match/db/upgrade.php
@@ -1,4 +1,4 @@
-<?php  //$Id$
+<?php  // $Id$
 
 // This file keeps track of upgrades to 
 // the match qtype plugin
diff --git a/question/type/multianswer/db/mysql.php b/question/type/multianswer/db/mysql.php
index eb380aaf77c..5d62b8e5c97 100644
--- a/question/type/multianswer/db/mysql.php
+++ b/question/type/multianswer/db/mysql.php
@@ -1,4 +1,4 @@
-<?php  //$Id$
+<?php  // $Id$
 
 // THIS FILE IS DEPRECATED!  PLEASE DO NOT MAKE CHANGES TO IT!
 //
diff --git a/question/type/multianswer/db/postgres7.php b/question/type/multianswer/db/postgres7.php
index f146c689725..644cbcc7f7e 100644
--- a/question/type/multianswer/db/postgres7.php
+++ b/question/type/multianswer/db/postgres7.php
@@ -1,4 +1,4 @@
-<?php  //$Id$
+<?php  // $Id$
 
 // THIS FILE IS DEPRECATED!  PLEASE DO NOT MAKE CHANGES TO IT!
 //
diff --git a/question/type/multianswer/db/upgrade.php b/question/type/multianswer/db/upgrade.php
index b827eff5c25..7156a8744bb 100644
--- a/question/type/multianswer/db/upgrade.php
+++ b/question/type/multianswer/db/upgrade.php
@@ -1,4 +1,4 @@
-<?php  //$Id$
+<?php  // $Id$
 
 // This file keeps track of upgrades to 
 // the multianswer qtype plugin
diff --git a/question/type/multichoice/db/mysql.php b/question/type/multichoice/db/mysql.php
index 271b09cf828..e0f78bebde4 100644
--- a/question/type/multichoice/db/mysql.php
+++ b/question/type/multichoice/db/mysql.php
@@ -1,4 +1,4 @@
-<?php  //$Id$
+<?php  // $Id$
 
 // THIS FILE IS DEPRECATED!  PLEASE DO NOT MAKE CHANGES TO IT!
 //
diff --git a/question/type/multichoice/db/postgres7.php b/question/type/multichoice/db/postgres7.php
index 8723be49567..7bb44a83459 100644
--- a/question/type/multichoice/db/postgres7.php
+++ b/question/type/multichoice/db/postgres7.php
@@ -1,4 +1,4 @@
-<?php  //$Id$
+<?php  // $Id$
 
 // THIS FILE IS DEPRECATED!  PLEASE DO NOT MAKE CHANGES TO IT!
 //
diff --git a/question/type/multichoice/db/upgrade.php b/question/type/multichoice/db/upgrade.php
index 3f4b4273b8c..49ffc787dff 100644
--- a/question/type/multichoice/db/upgrade.php
+++ b/question/type/multichoice/db/upgrade.php
@@ -1,4 +1,4 @@
-<?php  //$Id$
+<?php  // $Id$
 
 // This file keeps track of upgrades to 
 // the multichoice qtype plugin
diff --git a/question/type/numerical/db/mysql.php b/question/type/numerical/db/mysql.php
index 1a38e4fa174..962d25e18b4 100644
--- a/question/type/numerical/db/mysql.php
+++ b/question/type/numerical/db/mysql.php
@@ -1,4 +1,4 @@
-<?php  //$Id$
+<?php  // $Id$
 
 // THIS FILE IS DEPRECATED!  PLEASE DO NOT MAKE CHANGES TO IT!
 //
diff --git a/question/type/numerical/db/postgres7.php b/question/type/numerical/db/postgres7.php
index e1ac07c5bfa..5d57e653f23 100644
--- a/question/type/numerical/db/postgres7.php
+++ b/question/type/numerical/db/postgres7.php
@@ -1,4 +1,4 @@
-<?php  //$Id$
+<?php  // $Id$
 
 // THIS FILE IS DEPRECATED!  PLEASE DO NOT MAKE CHANGES TO IT!
 //
diff --git a/question/type/numerical/db/upgrade.php b/question/type/numerical/db/upgrade.php
index d01a86e1a44..344ddf9226c 100644
--- a/question/type/numerical/db/upgrade.php
+++ b/question/type/numerical/db/upgrade.php
@@ -1,4 +1,4 @@
-<?php  //$Id$
+<?php  // $Id$
 
 // This file keeps track of upgrades to 
 // the numerical qtype plugin
diff --git a/question/type/numerical/questiontype.php b/question/type/numerical/questiontype.php
index 63052f2dea4..cad1ddeb59d 100644
--- a/question/type/numerical/questiontype.php
+++ b/question/type/numerical/questiontype.php
@@ -84,7 +84,6 @@ class question_numerical_qtype extends question_shortanswer_qtype {
      * Save the units and the answers associated with this question.
      */
     function save_question_options($question) {
-        
         // Get old versions of the objects
         if (!$oldanswers = get_records('question_answers', 'question', $question->id, 'id ASC')) {
             $oldanswers = array();
diff --git a/question/type/randomsamatch/db/mysql.php b/question/type/randomsamatch/db/mysql.php
index a8a5ec34972..641cf3c9099 100644
--- a/question/type/randomsamatch/db/mysql.php
+++ b/question/type/randomsamatch/db/mysql.php
@@ -1,4 +1,4 @@
-<?php  //$Id$
+<?php  // $Id$
 
 // THIS FILE IS DEPRECATED!  PLEASE DO NOT MAKE CHANGES TO IT!
 //
diff --git a/question/type/randomsamatch/db/postgres7.php b/question/type/randomsamatch/db/postgres7.php
index 339d50050ae..77e6f484187 100644
--- a/question/type/randomsamatch/db/postgres7.php
+++ b/question/type/randomsamatch/db/postgres7.php
@@ -1,4 +1,4 @@
-<?php  //$Id$
+<?php  // $Id$
 
 // THIS FILE IS DEPRECATED!  PLEASE DO NOT MAKE CHANGES TO IT!
 //
diff --git a/question/type/randomsamatch/db/upgrade.php b/question/type/randomsamatch/db/upgrade.php
index a62e7f0328d..0934fb6a071 100644
--- a/question/type/randomsamatch/db/upgrade.php
+++ b/question/type/randomsamatch/db/upgrade.php
@@ -1,4 +1,4 @@
-<?php  //$Id$
+<?php  // $Id$
 
 // This file keeps track of upgrades to 
 // the randomsamatch qtype plugin
diff --git a/question/type/shortanswer/db/mysql.php b/question/type/shortanswer/db/mysql.php
index eb09aa2655a..eea4758ed43 100644
--- a/question/type/shortanswer/db/mysql.php
+++ b/question/type/shortanswer/db/mysql.php
@@ -1,4 +1,4 @@
-<?php  //$Id$
+<?php  // $Id$
 
 // THIS FILE IS DEPRECATED!  PLEASE DO NOT MAKE CHANGES TO IT!
 //
diff --git a/question/type/shortanswer/db/postgres7.php b/question/type/shortanswer/db/postgres7.php
index 3c43e19e1ba..b3414d7d780 100644
--- a/question/type/shortanswer/db/postgres7.php
+++ b/question/type/shortanswer/db/postgres7.php
@@ -1,4 +1,4 @@
-<?php  //$Id$
+<?php  // $Id$
 
 // THIS FILE IS DEPRECATED!  PLEASE DO NOT MAKE CHANGES TO IT!
 //
diff --git a/question/type/shortanswer/db/upgrade.php b/question/type/shortanswer/db/upgrade.php
index 4b6762a75dd..c230b2ecdf5 100644
--- a/question/type/shortanswer/db/upgrade.php
+++ b/question/type/shortanswer/db/upgrade.php
@@ -1,4 +1,4 @@
-<?php  //$Id$
+<?php  // $Id$
 
 // This file keeps track of upgrades to 
 // the shortanswer qtype plugin
diff --git a/question/type/shortanswer/questiontype.php b/question/type/shortanswer/questiontype.php
index 0fb6ec7b805..1f9dc31eddf 100644
--- a/question/type/shortanswer/questiontype.php
+++ b/question/type/shortanswer/questiontype.php
@@ -142,7 +142,7 @@ class question_shortanswer_qtype extends default_questiontype {
 
         /// Print input controls
 
-        if (isset($state->responses['']) && $state->responses['']!='' ) {
+        if (isset($state->responses['']) && $state->responses[''] != '') {
             $value = ' value="'.s($state->responses[''], true).'" ';
         } else {
             $value = ' value="" ';
diff --git a/question/type/truefalse/db/mysql.php b/question/type/truefalse/db/mysql.php
index ae5ec963812..a7b58b6550c 100644
--- a/question/type/truefalse/db/mysql.php
+++ b/question/type/truefalse/db/mysql.php
@@ -1,4 +1,4 @@
-<?php  //$Id$
+<?php  // $Id$
 
 // THIS FILE IS DEPRECATED!  PLEASE DO NOT MAKE CHANGES TO IT!
 //
diff --git a/question/type/truefalse/db/postgres7.php b/question/type/truefalse/db/postgres7.php
index 07e5810320c..48b9f2693ce 100644
--- a/question/type/truefalse/db/postgres7.php
+++ b/question/type/truefalse/db/postgres7.php
@@ -1,4 +1,4 @@
-<?php  //$Id$
+<?php  // $Id$
 
 // THIS FILE IS DEPRECATED!  PLEASE DO NOT MAKE CHANGES TO IT!
 //
diff --git a/question/type/truefalse/db/upgrade.php b/question/type/truefalse/db/upgrade.php
index c3705953dfc..8a45e703d6e 100644
--- a/question/type/truefalse/db/upgrade.php
+++ b/question/type/truefalse/db/upgrade.php
@@ -1,4 +1,4 @@
-<?php  //$Id$
+<?php  // $Id$
 
 // This file keeps track of upgrades to 
 // the truefalse qtype plugin