diff --git a/01 - Navigation/01 - Navigate to something you know/1.1. Project Tool Window.txt b/01 - Navigation/01 - Navigate to something you know/1.1. Project Tool Window.txt
index b977e2c6..27083451 100644
--- a/01 - Navigation/01 - Navigate to something you know/1.1. Project Tool Window.txt	
+++ b/01 - Navigation/01 - Navigate to something you know/1.1. Project Tool Window.txt	
@@ -1,10 +1,10 @@
 Project Tool Window
 
-Shows all files in project.
+Show all files in project.
 
 Alt+1 (Windows/Linux)
 Command+1 (Mac OS X)
 
 1. Open the Project Tool Window.
-2. Using the arrow keys, navigate to \01 - Navigation\01 - Navigate to something you know\Code\license.txt
+2. Using the arrow keys, navigate to \01 - Navigation\01 - Navigate to something you know\Code\license.txt.
 3. Start typing "Bar". Navigate to the next exercise.
diff --git a/01 - Navigation/01 - Navigate to something you know/1.3. Navigate to class.txt b/01 - Navigation/01 - Navigate to something you know/1.3. Navigate to class.txt
index e9880ffb..8cdcb970 100644
--- a/01 - Navigation/01 - Navigate to something you know/1.3. Navigate to class.txt	
+++ b/01 - Navigation/01 - Navigate to something you know/1.3. Navigate to class.txt	
@@ -5,19 +5,19 @@ Navigate to a class by (partial) class name.
 Ctrl+N (Windows/Linux)
 Command+O (Mac OS X)
 
-1. Navigate to class
+1. Navigate to class.
    Navigate to the Customer class. Open the file by hitting enter.
 
-2. Use CamelHumps to navigate
-   Navigate to the CustomerRepository class using CamelHumps (type "CR" or "CusR")
+2. Use CamelHumps to navigate.
+   Navigate to the CustomerRepository class using CamelHumps (type "CR" or "CusR").
 
-3. Use middle matching to navigate
-   Navigate to the DocumentRepository class by searching for "Repo"
+3. Use middle matching to navigate.
+   Navigate to the DocumentRepository class by searching for "Repo".
 
-4. Use wildcards
-   Navigate to the SettingsRepository by searching for "S*Repo"
+4. Use wildcards.
+   Navigate to the SettingsRepository by searching for "S*Repo".
 
 5. Filter to only check PHP files by clicking the filter icon.
 
-6. Include non-project classes
-   Check the "Include non-project classes" checkbox and navigate to ArrayObject (PHP SPL library)
\ No newline at end of file
+6. Include non-project classes.
+   Check the "Include non-project classes" checkbox and navigate to ArrayObject (PHP SPL library).
diff --git a/01 - Navigation/01 - Navigate to something you know/1.4. Navigate to file.txt b/01 - Navigation/01 - Navigate to something you know/1.4. Navigate to file.txt
index 89f045fd..0d2871fe 100644
--- a/01 - Navigation/01 - Navigate to something you know/1.4. Navigate to file.txt	
+++ b/01 - Navigation/01 - Navigate to something you know/1.4. Navigate to file.txt	
@@ -5,16 +5,16 @@ Navigate to a file by (partial) file name.
 Ctrl+Shift+N (Windows/Linux)
 Shift+Command+O (Mac OS X)
 
-1. Navigate to file
-   Navigate to the customer.php file. Open the file by hitting enter.
+1. Navigate to file.
+   Navigate to the Customer.php file. Open the file by hitting enter.
 
-2. Use CamelHumps to navigate
-   Navigate to the CustomerRepository.php file using CamelHumps (type "CR" or "CusR")
+2. Use CamelHumps to navigate.
+   Navigate to the CustomerRepository.php file using CamelHumps (type "CR" or "CusR").
 
-3. Use middle matching to navigate
-   Navigate to the DocumentRepository.php file by searching for "Repo"
+3. Use middle matching to navigate.
+   Navigate to the DocumentRepository.php file by searching for "Repo".
 
-4. Use wildcards
-   Navigate to the license.txt file by searching for "l*.txt"
+4. Use wildcards.
+   Navigate to the license.txt file by searching for "l*.txt".
 
-5. Filter to only check JavaScript files by clicking the filter icon. Search for Customer.js.
\ No newline at end of file
+5. Filter to only check JavaScript files by clicking the filter icon. Search for Customer.js.
diff --git a/01 - Navigation/01 - Navigate to something you know/1.5. Navigate to symbol.txt b/01 - Navigation/01 - Navigate to something you know/1.5. Navigate to symbol.txt
index 2b1eb883..aeb5d6d4 100644
--- a/01 - Navigation/01 - Navigate to something you know/1.5. Navigate to symbol.txt	
+++ b/01 - Navigation/01 - Navigate to something you know/1.5. Navigate to symbol.txt	
@@ -5,13 +5,13 @@ Navigate to a symbol by (partial) symbol name.
 Ctrl+Alt+Shift+N (Windows/Linux)
 Alt+Command+O (Mac OS X)
 
-1. Navigate to symbol
+1. Navigate to symbol.
    Navigate to the $_name protected variable in Customer.php.
 
-2. Use CamelHumps to navigate
-   Navigate to the getName() function using CamelHumps (type "gN" or "getN")
+2. Use CamelHumps to navigate.
+   Navigate to the getName() function using CamelHumps (type "gN" or "getN").
 
 3. Note that middle matching and wildcards also work when searching symbols.
    Example searches: "ebra" of "celebr*day" for the celebrateBirthday() function.
 
-4. Filter to only search in JavaScript files and find the celebrateBirthday() function in the Customer.js file.
\ No newline at end of file
+4. Filter to only search in JavaScript files and find the celebrateBirthday() function in the Customer.js file.
diff --git a/01 - Navigation/01 - Navigate to something you know/1.6. Search everywhere.txt b/01 - Navigation/01 - Navigate to something you know/1.6. Search everywhere.txt
index 78ba0cdf..624d7285 100644
--- a/01 - Navigation/01 - Navigate to something you know/1.6. Search everywhere.txt	
+++ b/01 - Navigation/01 - Navigate to something you know/1.6. Search everywhere.txt	
@@ -8,10 +8,10 @@ Double shift (Windows/Linux/Mac OS X)
 
 2. Navigate to the $_name protected variable in Customer.php.
 
-3. Use CamelHumps to navigate
-   Navigate to the CustomerRepository class using CamelHumps (type "CR" or "CusR")
+3. Use CamelHumps to navigate.
+   Navigate to the CustomerRepository class using CamelHumps (type "CR" or "CusR").
 
-4. Use middle matching to navigate
-   Navigate to the DocumentRepository.php file by searching for "Repo"
+4. Use middle matching to navigate.
+   Navigate to the DocumentRepository.php file by searching for "Repo".
 
-5. Find the "About" action and invoke it.
\ No newline at end of file
+5. Find the "About" action and invoke it.
diff --git a/01 - Navigation/01 - Navigate to something you know/Code/JetBrains/Customers/Customer.js b/01 - Navigation/01 - Navigate to something you know/Code/JetBrains/Customers/Customer.js
index 975b7141..79bb9d98 100644
--- a/01 - Navigation/01 - Navigate to something you know/Code/JetBrains/Customers/Customer.js	
+++ b/01 - Navigation/01 - Navigate to something you know/Code/JetBrains/Customers/Customer.js	
@@ -4,4 +4,4 @@ var Customer = function() {
     this.celebrateBirthday = function() {
         console.log('Yay!');
     }
-};
\ No newline at end of file
+};
diff --git a/01 - Navigation/01 - Navigate to something you know/Code/JetBrains/Customers/Customer.php b/01 - Navigation/01 - Navigate to something you know/Code/JetBrains/Customers/Customer.php
index 2e72f97b..6319a7ef 100644
--- a/01 - Navigation/01 - Navigate to something you know/Code/JetBrains/Customers/Customer.php	
+++ b/01 - Navigation/01 - Navigate to something you know/Code/JetBrains/Customers/Customer.php	
@@ -10,8 +10,8 @@ class Customer {
     protected $_age;
 
     /**
-     * @param $name string
-     * @param $age int
+     * @param string $name
+     * @param int $age
      */
     function __construct($name, $age)
     {
@@ -57,4 +57,4 @@ public function getName()
     public function celebrateBirthday() {
         echo 'Yay!';
     }
-} 
\ No newline at end of file
+}
diff --git a/01 - Navigation/01 - Navigate to something you know/Code/JetBrains/Customers/Repositories/CustomerRepository.php b/01 - Navigation/01 - Navigate to something you know/Code/JetBrains/Customers/Repositories/CustomerRepository.php
index 4baa2c1b..9c94fc7b 100644
--- a/01 - Navigation/01 - Navigate to something you know/Code/JetBrains/Customers/Repositories/CustomerRepository.php	
+++ b/01 - Navigation/01 - Navigate to something you know/Code/JetBrains/Customers/Repositories/CustomerRepository.php	
@@ -4,4 +4,4 @@
 
 class CustomerRepository extends RepositoryBase {
 
-} 
\ No newline at end of file
+}
diff --git a/01 - Navigation/01 - Navigate to something you know/Code/JetBrains/Customers/Repositories/DocumentRepository.php b/01 - Navigation/01 - Navigate to something you know/Code/JetBrains/Customers/Repositories/DocumentRepository.php
index 10cf5eb9..42817274 100644
--- a/01 - Navigation/01 - Navigate to something you know/Code/JetBrains/Customers/Repositories/DocumentRepository.php	
+++ b/01 - Navigation/01 - Navigate to something you know/Code/JetBrains/Customers/Repositories/DocumentRepository.php	
@@ -4,4 +4,4 @@
 
 class DocumentRepository extends RepositoryBase {
 
-} 
\ No newline at end of file
+}
diff --git a/01 - Navigation/01 - Navigate to something you know/Code/JetBrains/Customers/Repositories/RepositoryBase.php b/01 - Navigation/01 - Navigate to something you know/Code/JetBrains/Customers/Repositories/RepositoryBase.php
index 4fe1c755..aa339899 100644
--- a/01 - Navigation/01 - Navigate to something you know/Code/JetBrains/Customers/Repositories/RepositoryBase.php	
+++ b/01 - Navigation/01 - Navigate to something you know/Code/JetBrains/Customers/Repositories/RepositoryBase.php	
@@ -4,4 +4,4 @@
 
 abstract class RepositoryBase {
 
-} 
\ No newline at end of file
+}
diff --git a/01 - Navigation/01 - Navigate to something you know/Code/JetBrains/Customers/Repositories/SettingsRepository.php b/01 - Navigation/01 - Navigate to something you know/Code/JetBrains/Customers/Repositories/SettingsRepository.php
index 554cba9c..fdea8e18 100644
--- a/01 - Navigation/01 - Navigate to something you know/Code/JetBrains/Customers/Repositories/SettingsRepository.php	
+++ b/01 - Navigation/01 - Navigate to something you know/Code/JetBrains/Customers/Repositories/SettingsRepository.php	
@@ -4,4 +4,4 @@
 
 class SettingsRepository extends RepositoryBase {
 
-} 
\ No newline at end of file
+}
diff --git a/01 - Navigation/02 - Navigate to Declaration/2.1. Go to declaration.php b/01 - Navigation/02 - Navigate to Declaration/2.1. Go to declaration.php
index 3a52981d..cdc945be 100644
--- a/01 - Navigation/02 - Navigate to Declaration/2.1. Go to declaration.php	
+++ b/01 - Navigation/02 - Navigate to Declaration/2.1. Go to declaration.php	
@@ -2,7 +2,7 @@
 /**
  * Go to Declaration
  *
- * Navigates to the declaration of a symbol.
+ * Navigate to the declaration of a symbol.
  *
  * Ctrl+Click or Ctrl+B (Windows/Linux)
  * Command+Click or Command+B (Mac OS X)
@@ -16,15 +16,15 @@
 $name = 'Hadi';
 $age = 53;
 
-// 1. Ctrl+Click (or Command+Click on Mac) on the Customer symbol
-// 2. Use the keyboard shortcut
-// 3. Go to Declaration for the $age variable passed into the below constructor
+// 1. Ctrl+Click (or Command+Click on Mac) on the Customer symbol.
+// 2. Use the keyboard shortcut.
+// 3. Go to Declaration for the $age variable passed into the below constructor.
 $person = new Customer($name, $age);
 
-// 4. Navigate to the celebrateBirthday() function
-// 5. Go to Declaration for the $person variable
+// 4. Navigate to the celebrateBirthday() function.
+// 5. Go to Declaration for the $person variable.
 $person->celebrateBirthday();
 
-// 6. Go to Declaration for the ArrayIterator SPL class
+// 6. Go to Declaration for the ArrayIterator SPL class.
 $myArray = array();
 $myArrayIterator  = new \ArrayIterator($myArray);
diff --git a/01 - Navigation/03 - Navigating to somwhere we have been/3.1. Navigate back.php b/01 - Navigation/03 - Navigating to somwhere we have been/3.1. Navigate back.php
index ea7943c5..7625a6da 100644
--- a/01 - Navigation/03 - Navigating to somwhere we have been/3.1. Navigate back.php	
+++ b/01 - Navigation/03 - Navigating to somwhere we have been/3.1. Navigate back.php	
@@ -2,7 +2,7 @@
 /**
  * Navigate back / forward
  *
- * Returns the caret to the last navigation point.
+ * Return the caret to the last navigation point.
  *
  * Ctrl+Alt+Left / Right (Windows/Linux)
  * Alt+Command+Left / Right (Mac OS X)
@@ -14,14 +14,14 @@ class NavigateBack {
     public function startingPoint() {
         $navigateTo = new NavigateTo();
 
-        // 1. Navigate to destination()
-        // 3. Navigate forward using the keyboard shortcut
+        // 1. Navigate to destination().
+        // 3. Navigate forward using the keyboard shortcut.
         $navigateTo->destination();
     }
 }
 
 class NavigateTo {
     public function destination() {
-        // 2. Now navigate back using the keyboard shortcut
+        // 2. Now navigate back using the keyboard shortcut.
     }
 }
diff --git a/01 - Navigation/03 - Navigating to somwhere we have been/3.2. Next Method.php b/01 - Navigation/03 - Navigating to somwhere we have been/3.2. Next Method.php
index 3721b8e8..486c1c04 100644
--- a/01 - Navigation/03 - Navigating to somwhere we have been/3.2. Next Method.php	
+++ b/01 - Navigation/03 - Navigating to somwhere we have been/3.2. Next Method.php	
@@ -28,4 +28,4 @@ public function thirdFunction() {
     public function fourthFunction() {
 
     }
-}
\ No newline at end of file
+}
diff --git a/01 - Navigation/03 - Navigating to somwhere we have been/3.3. Recent files.txt b/01 - Navigation/03 - Navigating to somwhere we have been/3.3. Recent files.txt
index ad135225..0762266a 100644
--- a/01 - Navigation/03 - Navigating to somwhere we have been/3.3. Recent files.txt	
+++ b/01 - Navigation/03 - Navigating to somwhere we have been/3.3. Recent files.txt	
@@ -1,8 +1,8 @@
 Recent files
 
-Show a list of recent files
+Show a list of recent files.
 
 Ctrl+E (Windows/Linux)
 Command+E (Mac OS X)
 
-1. Filter list by typing - middle matching, wildcards and CamelHumps
\ No newline at end of file
+1. Filter list by typing - middle matching, wildcards and CamelHumps.
diff --git a/01 - Navigation/03 - Navigating to somwhere we have been/3.4. Recent edits.php b/01 - Navigation/03 - Navigating to somwhere we have been/3.4. Recent edits.php
index 0a24ca8f..1ab0fbd0 100644
--- a/01 - Navigation/03 - Navigating to somwhere we have been/3.4. Recent edits.php	
+++ b/01 - Navigation/03 - Navigating to somwhere we have been/3.4. Recent edits.php	
@@ -2,7 +2,7 @@
 /**
  * Navigate to Last Edit Location.
  *
- * Navigates back to where code was last edited.
+ * Navigate back to where code was last edited.
  *
  * Ctrl+Shift+Backspace (Windows/Linux)
  * Shift+Command+Delete (Mac OS X)
@@ -12,15 +12,15 @@
 
 class NavigateRecent {
     public function startingPoint() {
-        // 1. Navigate to step1()
+        // 1. Navigate to step1().
         $this->step1();
     }
 
     public function step1() {
-        // 2. Uncomment the following line
+        // 2. Uncomment the following line.
         // echo 'In step 1.';
 
-        // 3. Navigate to step2()
+        // 3. Navigate to step2().
         $this->step2();
     }
 
diff --git a/01 - Navigation/03 - Navigating to somwhere we have been/3.5. Bookmarks.php b/01 - Navigation/03 - Navigating to somwhere we have been/3.5. Bookmarks.php
index 7f052b3b..4389c0ed 100644
--- a/01 - Navigation/03 - Navigating to somwhere we have been/3.5. Bookmarks.php	
+++ b/01 - Navigation/03 - Navigating to somwhere we have been/3.5. Bookmarks.php	
@@ -2,7 +2,7 @@
 /**
  * Bookmarks
  *
- * Set, unset and navigate to bookmarks
+ * Set, unset and navigate to bookmarks.
  *
  * Windows/Linux:
  *   F11 Toggle Bookmark
@@ -20,8 +20,8 @@
  * 2. Navigate to secondFunction() and set a bookmark.
  * 3. Navigate to thirdFunction() and set bookmark with mnemonic, assign it number 3.
  * 4. Show a list of bookmarks and navigate between them.
- * 5. Navigate to the numbered bookmark (Ctrl+3)
- * 6. Remove the bookmark from secondFunction()
+ * 5. Navigate to the numbered bookmark (Ctrl+3).
+ * 6. Remove the bookmark from secondFunction().
  * 7. From the bookmarks list, add a description to one of the bookmarks.
  */
 
@@ -39,4 +39,4 @@ public function secondFunction() {
     public function thirdFunction() {
 
     }
-}
\ No newline at end of file
+}
diff --git a/01 - Navigation/04 - Navigate class hieracrhies/4.1. Go to Implementation.php b/01 - Navigation/04 - Navigate class hieracrhies/4.1. Go to Implementation.php
index f016827d..0ed19136 100644
--- a/01 - Navigation/04 - Navigate class hieracrhies/4.1. Go to Implementation.php	
+++ b/01 - Navigation/04 - Navigate class hieracrhies/4.1. Go to Implementation.php	
@@ -2,7 +2,7 @@
 /**
  * Go to Implementation
  *
- * Navigates to the implementation of a given class.
+ * Navigate to the implementation of a given class.
  *
  * Ctrl+Alt+B (Windows/Linux)
  * Alt+Command+B (Mac OS X)
@@ -15,12 +15,12 @@
 
 class GoToImplementation {
     public function pleaseGoThere() {
-        // 1. Put the caret on Customer and Go To Implementation
-        //    Get the choice of Customer, SilverCustomer and GoldCustomer
+        // 1. Put the caret on Customer and Go To Implementation.
+        //    Get the choice of Customer, SilverCustomer and GoldCustomer.
         //    SilverCustomer and GoldCustomer are indirect implementations because they derive from Customer.
         $customer = new Customer('Maarten', 0);
 
-        // 2. Put the caret on GoldCustomer and Go To Implementation
+        // 2. Put the caret on GoldCustomer and Go To Implementation.
         $customer = new GoldCustomer('Maarten');
     }
-}
\ No newline at end of file
+}
diff --git a/01 - Navigation/04 - Navigate class hieracrhies/4.2. Go to Derived.php b/01 - Navigation/04 - Navigate class hieracrhies/4.2. Go to Derived.php
index cdd2a2d2..d9fb30f3 100644
--- a/01 - Navigation/04 - Navigate class hieracrhies/4.2. Go to Derived.php	
+++ b/01 - Navigation/04 - Navigate class hieracrhies/4.2. Go to Derived.php	
@@ -29,4 +29,4 @@ public function setDiscount($discount);
      * @param string $name
      */
     public function setName($name);
-}
\ No newline at end of file
+}
diff --git a/01 - Navigation/04 - Navigate class hieracrhies/4.3. Go to Super.php b/01 - Navigation/04 - Navigate class hieracrhies/4.3. Go to Super.php
index 593554a1..39b41c52 100644
--- a/01 - Navigation/04 - Navigate class hieracrhies/4.3. Go to Super.php	
+++ b/01 - Navigation/04 - Navigate class hieracrhies/4.3. Go to Super.php	
@@ -2,7 +2,7 @@
 /**
  * Go to super class / method
  *
- * Navigates to the super class or method.
+ * Navigate to the super class or method.
  *
  * Ctrl+U (Windows/Linux)
  * Command+U (Mac OS X)
@@ -18,10 +18,10 @@ class GoldCustomer extends Customer
     // 3. Bring up the Hierarchy tool window and inspect the class hierarchy.
     //    You can also navigate from the tool window.
     /**
-     * @param $name string
+     * @param string $name
      */
     function __construct($name)
     {
         parent::__construct($name, 0.25);
     }
-}
\ No newline at end of file
+}
diff --git a/01 - Navigation/04 - Navigate class hieracrhies/Code/JetBrains/Customers/Customer.php b/01 - Navigation/04 - Navigate class hieracrhies/Code/JetBrains/Customers/Customer.php
index c6bb897a..4fe4998c 100644
--- a/01 - Navigation/04 - Navigate class hieracrhies/Code/JetBrains/Customers/Customer.php	
+++ b/01 - Navigation/04 - Navigate class hieracrhies/Code/JetBrains/Customers/Customer.php	
@@ -10,8 +10,8 @@ class Customer implements ICustomer
     protected $_discount;
 
     /**
-     * @param $name string
-     * @param $discount double
+     * @param string $name
+     * @param double $discount
      */
     function __construct($name, $discount)
     {
@@ -50,4 +50,4 @@ public function getName()
     {
         return $this->_name;
     }
-} 
\ No newline at end of file
+}
diff --git a/01 - Navigation/04 - Navigate class hieracrhies/Code/JetBrains/Customers/SilverCustomer.php b/01 - Navigation/04 - Navigate class hieracrhies/Code/JetBrains/Customers/SilverCustomer.php
index 4d3289e7..4e0221c4 100644
--- a/01 - Navigation/04 - Navigate class hieracrhies/Code/JetBrains/Customers/SilverCustomer.php	
+++ b/01 - Navigation/04 - Navigate class hieracrhies/Code/JetBrains/Customers/SilverCustomer.php	
@@ -4,10 +4,10 @@
 class SilverCustomer extends Customer
 {
     /**
-     * @param $name string
+     * @param string $name
      */
     function __construct($name)
     {
         parent::__construct($name, 0.10);
     }
-}
\ No newline at end of file
+}
diff --git a/01 - Navigation/05 - Find usages/5.1. Highlight Usages in File.php b/01 - Navigation/05 - Find usages/5.1. Highlight Usages in File.php
index f05c4e03..54c45992 100644
--- a/01 - Navigation/05 - Find usages/5.1. Highlight Usages in File.php	
+++ b/01 - Navigation/05 - Find usages/5.1. Highlight Usages in File.php	
@@ -2,7 +2,7 @@
 /**
  * Highlight Usages in File
  *
- * Highlights usages of a given symbol in the current file.
+ * Highlight usages of a given symbol in the current file.
  *
  * Ctrl+Shift+F7 (Windows/Linux)
  * Shift+Command+F7 (Mac OS X)
@@ -33,4 +33,4 @@ public function adjust($original, $delta) {
 
         return $newValue;
     }
-}
\ No newline at end of file
+}
diff --git a/01 - Navigation/05 - Find usages/5.2. Find Usages.php b/01 - Navigation/05 - Find usages/5.2. Find Usages.php
index 69a5019b..d3ed3d51 100644
--- a/01 - Navigation/05 - Find usages/5.2. Find Usages.php	
+++ b/01 - Navigation/05 - Find usages/5.2. Find Usages.php	
@@ -2,7 +2,7 @@
 /**
  * Find Usages
  *
- * Highlights usages of a given symbol in the current project.
+ * Highlight usages of a given symbol in the current project.
  *
  * Alt+F7 (Windows/Linux/Mac OS X)
  *
diff --git a/01 - Navigation/05 - Find usages/Code/FindUsagesSample.php b/01 - Navigation/05 - Find usages/Code/FindUsagesSample.php
index 9c411cc4..169c4c8b 100644
--- a/01 - Navigation/05 - Find usages/Code/FindUsagesSample.php	
+++ b/01 - Navigation/05 - Find usages/Code/FindUsagesSample.php	
@@ -8,4 +8,4 @@ public function makeUseOfFunction() {
         $target->adjust(5, 3);
         $target->adjust(3, 9);
     }
-} 
\ No newline at end of file
+}
diff --git a/01 - Navigation/06 - Structure tool window/6.1. Structure in PHP files.php b/01 - Navigation/06 - Structure tool window/6.1. Structure in PHP files.php
index 96e8d708..7d66f922 100644
--- a/01 - Navigation/06 - Structure tool window/6.1. Structure in PHP files.php	
+++ b/01 - Navigation/06 - Structure tool window/6.1. Structure in PHP files.php	
@@ -2,8 +2,8 @@
 /**
  * File Structure Tool Window
  *
- * Displays outline of file: classes, functions (with icons displaying accessibility).
- * Also shows HTML, JavaScript, CSS, ...
+ * Display outline of file: classes, functions (with icons displaying accessibility).
+ * Also show HTML, JavaScript, CSS, ...
  *
  * Alt+7 (Windows/Linux)
  * Command+7 s(Windows/Linux)
@@ -57,4 +57,4 @@ function standardFunction() {
 <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Debitis deserunt ea expedita magni omnis quis temporibus
     velit vitae. Ex laboriosam nesciunt nisi obcaecati possimus quia repellendus sequi similique soluta voluptas?</p>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/01 - Navigation/06 - Structure tool window/6.2. Structure in HTML files.html b/01 - Navigation/06 - Structure tool window/6.2. Structure in HTML files.html
index 313e0106..9c807619 100644
--- a/01 - Navigation/06 - Structure tool window/6.2. Structure in HTML files.html	
+++ b/01 - Navigation/06 - Structure tool window/6.2. Structure in HTML files.html	
@@ -9,7 +9,7 @@ <h1>Structure in HTML files</h1>
 <div id="contents">
     <h2>File Structure Tool Window</h2>
 
-    <p>Displays outline of file: HTML elements, JavaScript, ...</p>
+    <p>Display outline of file: HTML elements, JavaScript, ...</p>
     <ul>
         <li>Alt+7 (Windows/Linux)</li>
         <li>Command+7 (Mac OS X)</li>
diff --git a/02 - Editing/01 - Completion/1.1. Basic Completion.php b/02 - Editing/01 - Completion/1.1. Basic Completion.php
index 7e606aea..305f859c 100644
--- a/02 - Editing/01 - Completion/1.1. Basic Completion.php	
+++ b/02 - Editing/01 - Completion/1.1. Basic Completion.php	
@@ -21,8 +21,8 @@ class BasicCompletion {
     //    Use the Basic Completion keyboard shortcut. After the equals sign, Basic Completion shows the locally scoped
     //      Basic completion options followed by the wider scope of Basic Completion items.
     // 3. The most frequently used item is usually pre-selected e.g. $this->Age might be the most used.
-    // 4. Dismiss the window with Esc
-    // 5. Space, tab and enter accept the choice
+    // 4. Dismiss the window with Esc.
+    // 5. Space, tab and enter accept the choice.
     // 6. Type: $this->r
     //    Complete the statement using the keyboard shortcut.
     // 7. Type: if (true
diff --git a/02 - Editing/01 - Completion/1.2. Import Completion.php b/02 - Editing/01 - Completion/1.2. Import Completion.php
index a4917eab..ea1b774b 100644
--- a/02 - Editing/01 - Completion/1.2. Import Completion.php	
+++ b/02 - Editing/01 - Completion/1.2. Import Completion.php	
@@ -18,4 +18,4 @@
 
 class ImportCompletion
     implements // ICustomer {
-}
\ No newline at end of file
+}
diff --git a/02 - Editing/02 - Selecting Code/2.2. Column Selection.php b/02 - Editing/02 - Selecting Code/2.2. Column Selection.php
index 135958e0..abb82565 100644
--- a/02 - Editing/02 - Selecting Code/2.2. Column Selection.php	
+++ b/02 - Editing/02 - Selecting Code/2.2. Column Selection.php	
@@ -13,7 +13,7 @@
 class ColumnSelection {
     // 1. Enable column selection.
     // 2. Draw a rectangle over the $someVariable column.
-    // 3. Rename the variable to $foo
+    // 3. Rename the variable to $foo.
     // 2. Disable column selection.
     public function columnSelection() {
         $someVariable = 3;
diff --git a/02 - Editing/04 - Surround With/4.1. Surround with.php b/02 - Editing/04 - Surround With/4.1. Surround with.php
index 25e18d0b..55e39602 100644
--- a/02 - Editing/04 - Surround With/4.1. Surround with.php	
+++ b/02 - Editing/04 - Surround With/4.1. Surround with.php	
@@ -2,7 +2,7 @@
 /**
  * Surround With
  *
- * Wraps selected text with new content, e.g. try/catch or if statement.
+ * Wrap selected text with new content, e.g. try/catch or if statement.
  *
  * Ctrl+Alt+T (Windows/Linux)
  * Alt+Command+T (Mac OS X)
diff --git a/02 - Editing/06 - Generate code/6.1. Generate Code.php b/02 - Editing/06 - Generate code/6.1. Generate Code.php
index 6fb6ae3c..71a4c73a 100644
--- a/02 - Editing/06 - Generate code/6.1. Generate Code.php	
+++ b/02 - Editing/06 - Generate code/6.1. Generate Code.php	
@@ -47,4 +47,4 @@ public function getId()
     {
         return $this->_id;
     }
-}
\ No newline at end of file
+}
diff --git a/02 - Editing/07 - Rearrange Reformat/7.1. Rearrange Reformat.php b/02 - Editing/07 - Rearrange Reformat/7.1. Rearrange Reformat.php
index b04558ff..57076567 100644
--- a/02 - Editing/07 - Rearrange Reformat/7.1. Rearrange Reformat.php	
+++ b/02 - Editing/07 - Rearrange Reformat/7.1. Rearrange Reformat.php	
@@ -2,7 +2,7 @@
 /**
  * Rearrange/Reformat Code
  *
- * Rearranges entries in code according to settings. Reformats all code according to code style.
+ * Rearrange entries in code according to settings. Reformat all code according to code style.
  *
  * Ctrl+Alt+L (Windows/Linux)
  * Alt+Command+L (Mac OS X)
@@ -15,8 +15,8 @@
 
 // 1. The class below is a mess.
 //    - Public/protected/static members are all mixed.
-//    - Brackets are inconsistent
-//    - Indents are inconsistent
+//    - Brackets are inconsistent.
+//    - Indents are inconsistent.
 // 2. Use Code | Rearrange Code menu to reorganize the class below.
 // 3. Use undo and roll back the Rearrange Code action.
 // 4. There are also some unused imports (Editing2 and Editing6). The Code | Optimize Imports menu will solve this.
@@ -76,4 +76,4 @@ public function getFourthProperty()
     {
         return $this->_fourthProperty;
     }
-}
\ No newline at end of file
+}
diff --git a/02 - Editing/08 - Multiple Selection/1.1. Multiple selection in PHP.php b/02 - Editing/08 - Multiple Selection/1.1. Multiple selection in PHP.php
index 92313833..d4626c0c 100644
--- a/02 - Editing/08 - Multiple Selection/1.1. Multiple selection in PHP.php	
+++ b/02 - Editing/08 - Multiple Selection/1.1. Multiple selection in PHP.php	
@@ -17,9 +17,9 @@
 // 2. Place the cursor right after the first *. Press and hold Alt and use the mouse to select
 //    the locations where a cursor is desired, right after every *.
 // 3. Release Alt and start typing. Text should now appear at every cursor. Use backspace to remove
-//    all *. Add ' at the start of each line. Move the cursors to the end of the line and add ',
+//    all *. Add ' at the start of each line. Move the cursors to the end of the line and add ',.
 // 4. Hit Escape to revert back to one cursor. Select the | in the first line. Use Select Next Occurrence
-//    to select all | characters and have a cursor there. Remove the character and replace it with ', '
+//    to select all | characters and have a cursor there. Remove the character and replace it with ', '.
 //    Move the cursors to the end of the line and press the delete key. This will move all resources to just one line.
 // 5. Hit Escape to revert back to one cursor and add array( at the beginning of the line and ); at the end. We now have an array.
 // 6. Hold Alt and drag the mouse from the number 6 in front to the // 1.. Note that the multiple selection now selected
diff --git a/03 - Inspections/01 - Highlights.php b/03 - Inspections/01 - Highlights.php
index 275a7ea4..024fca63 100644
--- a/03 - Inspections/01 - Highlights.php	
+++ b/03 - Inspections/01 - Highlights.php	
@@ -8,13 +8,13 @@
 namespace Inspections1\JetBrains;
 
 class Highlights {
-    // 1. An error highlight should be shown in the following function (missing semicolon)
+    // 1. An error highlight should be shown in the following function (missing semicolon).
     public function errorFunction() {
         echo 'First line'
         echo 'Second line';
     }
 
-    // 2. A warning highlight should be shown in the following function (foreach over boolean?)
+    // 2. A warning highlight should be shown in the following function (foreach over boolean?).
     public function warningFunction1() {
         $variable = true;
         foreach ($variable as $item) {
@@ -31,7 +31,7 @@ public function warningFunction2() {
         }
     }
 
-    // 4. A warning highlight should be shown in the following function (missing break statement) - this is actually a suggestion
+    // 4. A warning highlight should be shown in the following function (missing break statement) - this is actually a suggestion.
     public function warningFunction3() {
         $variable = 1;
         switch ($variable) {
@@ -42,12 +42,12 @@ public function warningFunction3() {
         }
     }
 
-    // 5. Dead code (unused variable)
+    // 5. Dead code (unused variable).
     public function deadCodeFunction1() {
         $variable = true;
     }
 
-    // 6. Dead code (unused variable)
+    // 6. Dead code (unreachable statement).
     public function deadCodeFunction2() {
         return true;
 
@@ -61,4 +61,4 @@ public function deadCodeFunction2() {
     public function spelling() {
         $mispelled = true;
     }
-}
\ No newline at end of file
+}
diff --git a/03 - Inspections/02 - Quick Fixes.php b/03 - Inspections/02 - Quick Fixes.php
index dff6f39c..e014089f 100644
--- a/03 - Inspections/02 - Quick Fixes.php	
+++ b/03 - Inspections/02 - Quick Fixes.php	
@@ -27,4 +27,4 @@ public function importClass() {
     public function undefinedVariable() {
         $this->_variable = 'test';
     }
-}
\ No newline at end of file
+}
diff --git a/03 - Inspections/03 - Navigation.php b/03 - Inspections/03 - Navigation.php
index 41fb37f8..87bd8b6e 100644
--- a/03 - Inspections/03 - Navigation.php	
+++ b/03 - Inspections/03 - Navigation.php	
@@ -56,4 +56,4 @@ public function deadCodeFunction2() {
     public function spelling() {
         $mispelled = true;
     }
-}
\ No newline at end of file
+}
diff --git a/03 - Inspections/04 - Gutter and Lens.php b/03 - Inspections/04 - Gutter and Lens.php
index 1ce36310..ecdc034e 100644
--- a/03 - Inspections/04 - Gutter and Lens.php	
+++ b/03 - Inspections/04 - Gutter and Lens.php	
@@ -10,7 +10,7 @@
 // 1. On the right-hand side, find the error gutter.
 // 2. Hover over the square at the top and get a summary of the code quality in the file.
 // 3. Hover over a small stripe to see the warning/error information.
-// 4. Hover over a small stripe to see lens mode (only when the code in which the issue occurs is not in viewport)
+// 4. Hover over a small stripe to see lens mode (only when the code in which the issue occurs is not in viewport).
 class Navigation {
     public function errorFunction() {
         echo 'First line'
@@ -56,4 +56,4 @@ public function deadCodeFunction2() {
     public function spelling() {
         $mispelled = true;
     }
-}
\ No newline at end of file
+}
diff --git a/03 - Inspections/05 - Settings.php b/03 - Inspections/05 - Settings.php
index a5554203..03ff1de6 100644
--- a/03 - Inspections/05 - Settings.php	
+++ b/03 - Inspections/05 - Settings.php	
@@ -16,4 +16,4 @@
 
 namespace Inspections5\JetBrains;
 
-@phpinfo();
\ No newline at end of file
+@phpinfo();
diff --git a/03 - Inspections/06 - PHPMD PHPCS.txt b/03 - Inspections/06 - PHPMD PHPCS.txt
index cf63da81..396f79a8 100644
--- a/03 - Inspections/06 - PHPMD PHPCS.txt	
+++ b/03 - Inspections/06 - PHPMD PHPCS.txt	
@@ -6,6 +6,6 @@ Ctrl+Alt+S (Windows/Linux)
 Command+, (Mac OS X)
 
 1. Make sure PHP Code Sniffer is installed through PEAR. See http://pear.php.net/package/PHP_CodeSniffer.
-2. Open the project settings | php | code sniffer and configure the path to phpcs / phpcs.bat
+2. Open the project settings | php | code sniffer and configure the path to phpcs / phpcs.bat.
 3. Apply settings and open project settings | inspections. Enable PHP Code Sniffer and set he code standard to validate against.
-4. Run PHP Code Sniffer inspections on the current project.
\ No newline at end of file
+4. Run PHP Code Sniffer inspections on the current project.
diff --git a/03 - Inspections/07 - Find Issues.php b/03 - Inspections/07 - Find Issues.php
index fdfe61e2..cc5883ab 100644
--- a/03 - Inspections/07 - Find Issues.php	
+++ b/03 - Inspections/07 - Find Issues.php	
@@ -22,4 +22,4 @@ public function warningFunction() {
     public function deadCodeFunction() {
         $variable = true;
     }
-}
\ No newline at end of file
+}
diff --git a/03 - Inspections/08 - Run Inspections.txt b/03 - Inspections/08 - Run Inspections.txt
index 621b7644..9e693d3a 100644
--- a/03 - Inspections/08 - Run Inspections.txt	
+++ b/03 - Inspections/08 - Run Inspections.txt	
@@ -12,4 +12,4 @@ Alt+Command+Up / Down (Mac OS X)
 4. Inspect the results in the tool window.
 5. Group items by severity.
 6. Use the keyboard shortcuts to navigate around.
-7. Export inspections to HTML.
\ No newline at end of file
+7. Export inspections to HTML.
diff --git a/04 - Live Templates/01 - Code Expansion/1.1. Code Expansion.php b/04 - Live Templates/01 - Code Expansion/1.1. Code Expansion.php
index 094691e9..3ca59c58 100644
--- a/04 - Live Templates/01 - Code Expansion/1.1. Code Expansion.php	
+++ b/04 - Live Templates/01 - Code Expansion/1.1. Code Expansion.php	
@@ -3,7 +3,7 @@
  * Code Expansion
  *
  * Expand text shortcut using template.
- * Expands into code with variable “hotspots”
+ * Expands into code with variable “hotspots”.
  * Hotspot can be linked to a macro, such as “suggest type of variable”, “suggest name for variable”, “clipboard content”, “new GUID”, etc.
  * Tab to move between hotspots.
  * Template can define end point for caret.
@@ -35,4 +35,4 @@ protected function secondFunction(){
 
         // fore <TAB>
     }
-}
\ No newline at end of file
+}
diff --git a/04 - Live Templates/02 - Creating Live Templates/2.1. Simple template.php b/04 - Live Templates/02 - Creating Live Templates/2.1. Simple template.php
index f118daaf..a917c6f7 100644
--- a/04 - Live Templates/02 - Creating Live Templates/2.1. Simple template.php	
+++ b/04 - Live Templates/02 - Creating Live Templates/2.1. Simple template.php	
@@ -24,4 +24,4 @@ class $CLASS_NAME$ {
    The $END$ variable is a special marker telling the IDE where to locate the cursor after expanding the template.
 */
 
-// cls <TAB>
\ No newline at end of file
+// cls <TAB>
diff --git a/04 - Live Templates/02 - Creating Live Templates/2.2. Advanced template.php b/04 - Live Templates/02 - Creating Live Templates/2.2. Advanced template.php
index ed4f55aa..1cd58b9e 100644
--- a/04 - Live Templates/02 - Creating Live Templates/2.2. Advanced template.php	
+++ b/04 - Live Templates/02 - Creating Live Templates/2.2. Advanced template.php	
@@ -9,13 +9,13 @@
 1. Open the IDE settings | Live Templates and add a new live template.
    Name the live template "prop".
 
-   Set the template text to the code found in AdvancedTemplate.txt. Note the variables used (And $$ is used to escape PHP's $ sign)
+   Set the template text to the code found in AdvancedTemplate.txt. Note the variables used (And $$ is used to escape PHP's $ sign).
 
    Set the context for the live template to be available in PHP.
    Reformat according to style should be enabled.
 
    Click the Edit Variables button. We can specify default values or expressions for our template hotspots.
-   Set the expression for PROPERTY_NAME to: capitalize(FIELD_NAME)
+   Set the expression for PROPERTY_NAME to: capitalize(FIELD_NAME).
    This will automatically populate the PROPERTY_NAME variable with the contents of FIELD_NAME.
 
    Other templates can be used, for example the current user name, date, time. We can also trigger autocompletion.
diff --git a/04 - Live Templates/02 - Creating Live Templates/2.3. Smarter fore.php b/04 - Live Templates/02 - Creating Live Templates/2.3. Smarter fore.php
index 8dcccdc7..e7b0c2a4 100644
--- a/04 - Live Templates/02 - Creating Live Templates/2.3. Smarter fore.php	
+++ b/04 - Live Templates/02 - Creating Live Templates/2.3. Smarter fore.php	
@@ -19,8 +19,8 @@
    Reformat according to style should be enabled.
 
    Click the Edit Variables button. We can specify default values or expressions for our template hotspots.
-   Set the expression for ITEMS to: complete()
-   Set the default for ITEM to "$item" (including quotes)
+   Set the expression for ITEMS to: complete().
+   Set the default for ITEM to "$item" (including quotes).
 
    Save the live template.
 
diff --git a/04 - Live Templates/02 - Creating Live Templates/2.4. Create from Editor.php b/04 - Live Templates/02 - Creating Live Templates/2.4. Create from Editor.php
index 9d8fd20e..b3e0b720 100644
--- a/04 - Live Templates/02 - Creating Live Templates/2.4. Create from Editor.php	
+++ b/04 - Live Templates/02 - Creating Live Templates/2.4. Create from Editor.php	
@@ -9,8 +9,8 @@
 echo "$TEXT$";
 $END$
 
-// 2. Use the Tools | Save as Live Template... menu
-// 3. Save the template as 'e'
-// 4. Test the template
+// 2. Use the Tools | Save as Live Template... menu.
+// 3. Save the template as 'e'.
+// 4. Test the template.
 
-// e <TAB>
\ No newline at end of file
+// e <TAB>
diff --git a/04 - Live Templates/02 - Creating Live Templates/AdvancedTemplate.txt b/04 - Live Templates/02 - Creating Live Templates/AdvancedTemplate.txt
index 1a6f2e19..7effc5ae 100644
--- a/04 - Live Templates/02 - Creating Live Templates/AdvancedTemplate.txt	
+++ b/04 - Live Templates/02 - Creating Live Templates/AdvancedTemplate.txt	
@@ -19,4 +19,4 @@ public function set$PROPERTY_NAME$($$$FIELD_NAME$)
 public function get$PROPERTY_NAME$()
 {
     return $this->_$FIELD_NAME$;
-}
\ No newline at end of file
+}
diff --git a/04 - Live Templates/04 - File Templates/4.1. Create a file template.txt b/04 - Live Templates/04 - File Templates/4.1. Create a file template.txt
index 2beafed5..1a1f700d 100644
--- a/04 - Live Templates/04 - File Templates/4.1. Create a file template.txt	
+++ b/04 - Live Templates/04 - File Templates/4.1. Create a file template.txt	
@@ -2,7 +2,7 @@ Create a file template.
 
 These are applied when creating a new file or generating code. Can contain includes. Customize code generation.
 
-1. Open the IDE settings and navigate to IDE Settings | File and Code Templates
+1. Open the IDE settings and navigate to IDE Settings | File and Code Templates.
 2. Under includes, edit the PHP File Header include so that it matches your preference. Save the changes.
 3. Create a new file in the current folder. Alt+Insert (Command+N) and generate a new PHP class in the current folder.
    The header for this file should reflect the chanegs we just made.
@@ -11,10 +11,10 @@ These are applied when creating a new file or generating code. Can contain inclu
 <?php
 #parse("PHP File Header.php")
 
-require(dirname(__FILE__) . '/../libs/Smarty.class.php');
+require dirname(__FILE__) . '/../libs/Smarty.class.php';
 
 \$smarty = new Smarty();
 \$smarty->assign('title', '${Title}', true);
 \$smarty->display('${TemplateName}.tpl');
 
-5. Test the new file template. Note that the variables defined in the template can be provided through the New File dialog.
\ No newline at end of file
+5. Test the new file template. Note that the variables defined in the template can be provided through the New File dialog.
diff --git a/05 - Refactoring/01 - Refactor This.php b/05 - Refactoring/01 - Refactor This.php
index 5f1dfb5a..dfdc7e9a 100644
--- a/05 - Refactoring/01 - Refactor This.php	
+++ b/05 - Refactoring/01 - Refactor This.php	
@@ -14,7 +14,7 @@
 //    Note that the IDe can also search in comments / strings.
 $name = 'Maarten';
 
-// 2. See that the Rename refactoring hs updated all occurrences of the variables in the current scope.
+// 2. See that the Rename refactoring has updated all occurrences of the variables in the current scope.
 echo $name . ' was here.'; // review: isn't this $name variable named wrong?
 
 // 3. The Refactor This menu also works on blocks of code. Select the following lines of code and use Refactor This.
@@ -30,4 +30,4 @@
 // 5. From the Project Tool Window, select the current file. Use Refactor This and rename it to "01 - Refactor This - done.php".
 //    Do not use te Refactor button, instead use Preview to see which files will be affected by the rename.
 //    Note that Code.php will be updated.
-//    From the tool window, click Do Refactor to continue the refactoring.
\ No newline at end of file
+//    From the tool window, click Do Refactor to continue the refactoring.
diff --git a/05 - Refactoring/02 - Change Signature.php b/05 - Refactoring/02 - Change Signature.php
index 108d7df8..d9059778 100644
--- a/05 - Refactoring/02 - Change Signature.php	
+++ b/05 - Refactoring/02 - Change Signature.php	
@@ -25,7 +25,7 @@ function addTwoNumbers($a, $b) {
 $four = addTwoNumbers(2, 2);
 
 // 3. Change the function signature: rename the $name parameter to $firstName add a $lastName parameter.
-//    Specify a default value for the $lastName variable, we want our code to compile
+//    Specify a default value for the $lastName variable, we want our code to compile.
 //    E.g. use '' to set an empty string everywhere sayHello is called.
 //
 //    We can also propagate parameters. The usingSayHello() below uses $name as well, we may want to propagate
@@ -51,4 +51,4 @@ public static function usingSayHello($name) {
         sayHello($name);
     }
 }
-UsingSayHelloClass::usingSayHello('Maarten');
\ No newline at end of file
+UsingSayHelloClass::usingSayHello('Maarten');
diff --git a/05 - Refactoring/03 - Copy Clone.php b/05 - Refactoring/03 - Copy Clone.php
index 8de8aac1..3cca906d 100644
--- a/05 - Refactoring/03 - Copy Clone.php	
+++ b/05 - Refactoring/03 - Copy Clone.php	
@@ -13,7 +13,7 @@
 //    Do this from the Project Tool Window and do not touch the mouse.
 //    (Alt+1 / Command+1, arrow keys, F5)
 
-// 2. Clone the current file and name it "03 - Copy Clone (cloned).php"
+// 2. Clone the current file and name it "03 - Copy Clone (cloned).php".
 //    Use the Shift+F5 keyboard shortcut from within the editor.
 
-// 2. Copy the current file to the Code directory. Drag/drop it using Ctrl key pressed.
\ No newline at end of file
+// 2. Copy the current file to the Code directory. Drag/drop it using Ctrl key pressed.
diff --git a/05 - Refactoring/04 - Extract Constant.php b/05 - Refactoring/04 - Extract Constant.php
index e668ef47..68379542 100644
--- a/05 - Refactoring/04 - Extract Constant.php	
+++ b/05 - Refactoring/04 - Extract Constant.php	
@@ -32,4 +32,4 @@ class Db {
     public function getAll($query, $pageSize) {
         return array();
     }
-}
\ No newline at end of file
+}
diff --git a/05 - Refactoring/05 - Extract Field.php b/05 - Refactoring/05 - Extract Field.php
index 3c20a7de..571112d4 100644
--- a/05 - Refactoring/05 - Extract Field.php	
+++ b/05 - Refactoring/05 - Extract Field.php	
@@ -17,4 +17,4 @@ public function greet($name) {
         //    Make it a protected field.
         return 'Hello' . ', '  . $name;
     }
-}
\ No newline at end of file
+}
diff --git a/05 - Refactoring/06 - Extract Interface.php b/05 - Refactoring/06 - Extract Interface.php
index ed55b87e..b19c2552 100644
--- a/05 - Refactoring/06 - Extract Interface.php	
+++ b/05 - Refactoring/06 - Extract Interface.php	
@@ -39,7 +39,7 @@ function __construct()
     /**
      * Get by id.
      *
-     * @param $id int Id
+     * @param int $id ID
      * @return mixed Instance.
      */
     public function get($id) {
@@ -71,4 +71,4 @@ public function save($instance)
     public function delete($id)
     {
     }
-}
\ No newline at end of file
+}
diff --git a/05 - Refactoring/07 - Extract Method.php b/05 - Refactoring/07 - Extract Method.php
index 58d49730..d23ef949 100644
--- a/05 - Refactoring/07 - Extract Method.php	
+++ b/05 - Refactoring/07 - Extract Method.php	
@@ -2,7 +2,7 @@
 /**
  * Extract Method
  *
- * Extracts a block of code into a method, detecting variables.
+ * Extract a block of code into a method, detecting variables.
  *
  * Ctrl+Alt+M (Windows/Linux)
  * Alt+Command+M (Mac OS X)
@@ -42,4 +42,4 @@ public function run() {
         $to = 'maarten.balliauw@jetbrains.com';
         mail($to, 'Database created', $body);
     }
-}
\ No newline at end of file
+}
diff --git a/05 - Refactoring/08 - Extract Parameter.js b/05 - Refactoring/08 - Extract Parameter.js
index 66199b62..d60f7d82 100644
--- a/05 - Refactoring/08 - Extract Parameter.js	
+++ b/05 - Refactoring/08 - Extract Parameter.js	
@@ -1,7 +1,7 @@
 /**
  * Extract Parameter
  *
- * Adds a new parameter to a function declaration. Determines the default. Can generate JSDoc.
+ * Add a new parameter to a function declaration. Determine the default. Can generate JSDoc.
  *
  * Ctrl+Alt+P (Windows/Linux)
  * Alt+Command+P (Mac OS X)
@@ -20,4 +20,4 @@
             return 'Hello' + ', ' + _name;
         }
     }
-})(window.jetbrains = window.jetbrains || {});
\ No newline at end of file
+})(window.jetbrains = window.jetbrains || {});
diff --git a/05 - Refactoring/09 - Extract Variable.php b/05 - Refactoring/09 - Extract Variable.php
index 2b9c89c8..4e1eaeae 100644
--- a/05 - Refactoring/09 - Extract Variable.php	
+++ b/05 - Refactoring/09 - Extract Variable.php	
@@ -2,7 +2,7 @@
 /**
  * Extract Variable
  *
- * Puts the result of a selected expression into a variable. The original expression is replaced with the new variable.
+ * Put the result of a selected expression into a variable. The original expression is replaced with the new variable.
  *
  * Ctrl+Alt+V (Windows/Linux)
  * Alt+Command+V (Mac OS X)
@@ -26,4 +26,4 @@ public function renderHeader() {
         echo "{$this->_blogName} - {$this->_blogSubtitle}";
         echo '</h1>';
     }
-}
\ No newline at end of file
+}
diff --git a/05 - Refactoring/10 - Inline.php b/05 - Refactoring/10 - Inline.php
index 938d15f2..d7b3e3ef 100644
--- a/05 - Refactoring/10 - Inline.php	
+++ b/05 - Refactoring/10 - Inline.php	
@@ -12,4 +12,4 @@
 
 // 1. Place the caret over $name and inline the variable.
 $name = 'Maarten';
-echo $name;
\ No newline at end of file
+echo $name;
diff --git a/05 - Refactoring/11 - Move.php b/05 - Refactoring/11 - Move.php
index 0bc89723..e8ce0307 100644
--- a/05 - Refactoring/11 - Move.php	
+++ b/05 - Refactoring/11 - Move.php	
@@ -2,7 +2,7 @@
 /**
  * Move
  *
- * Changes the location of a file, directory, class or static member.
+ * Change the location of a file, directory, class or static member.
  *
  * F6 (Windows/Linux/Mac OS X)
  */
@@ -28,6 +28,6 @@ class Logger {
 
 }
 
-// 5. Note that the calls to Utilities::log() have been updated
+// 5. Note that the calls to Utilities::log() have been updated.
 Utilities::log('Almost at the end of the exercise');
-Utilities::log('At the end of the exercise');
\ No newline at end of file
+Utilities::log('At the end of the exercise');
diff --git a/05 - Refactoring/12 - Pull Members Up.php b/05 - Refactoring/12 - Pull Members Up.php
index e8df732f..82fb8c73 100644
--- a/05 - Refactoring/12 - Pull Members Up.php	
+++ b/05 - Refactoring/12 - Pull Members Up.php	
@@ -34,4 +34,4 @@ public function getName() {
 
 $person = new Person();
 $person->getName();
-$person->calculateDiscount(100);
\ No newline at end of file
+$person->calculateDiscount(100);
diff --git a/05 - Refactoring/13 - Rename.php b/05 - Refactoring/13 - Rename.php
index 1395ac14..3353044f 100644
--- a/05 - Refactoring/13 - Rename.php	
+++ b/05 - Refactoring/13 - Rename.php	
@@ -2,7 +2,7 @@
 /**
  * Rename
  *
- * Allow you to rename symbols, automatically correcting all references in the code.
+ * Rename symbols, automatically correcting all references in the code.
  *
  * Shift+F6 (Windows/Linux/Mac OS X)
  */
@@ -14,14 +14,14 @@
 class Person {
     // ...
 
-    // 2. Rename the sayHello() function to sayGoodbye()
+    // 2. Rename the sayHello() function to sayGoodbye().
     public function sayHello() {
         return 'Hello!';
     }
 
     // 3. Rename the $name parameter to $string. Note that the PHPDoc block is updated as well.
     /**
-     * @param $name string Name of the person.
+     * @param string $name Name of the person.
      */
     public function greet($name) {
 
@@ -31,4 +31,4 @@ public function greet($name) {
 $person = new Person(); // creates a new Person
 $person->sayHello();
 
-// 4. Rename the current file to "13 - Rename - done.php". Note that all usages of the file will be updated.
\ No newline at end of file
+// 4. Rename the current file to "13 - Rename - done.php". Note that all usages of the file will be updated.
diff --git a/05 - Refactoring/14 - Safe Delete.php b/05 - Refactoring/14 - Safe Delete.php
index df698f61..e9e44864 100644
--- a/05 - Refactoring/14 - Safe Delete.php	
+++ b/05 - Refactoring/14 - Safe Delete.php	
@@ -10,7 +10,7 @@
 
 namespace Refactoring14\JetBrains;
 
-require_once('Code/MoreCode.php');
+require_once 'Code/MoreCode.php';
 
 // 1. Safe Delete the CoolPerson class from the Project Tool Window.
 //    Note that it is not safe to delete the file as it is being used elsewhere.
@@ -20,4 +20,4 @@ class CoolPerson {
     public function __construct($name) {
         $this->_name = $name;
     }
-}
\ No newline at end of file
+}
diff --git a/05 - Refactoring/15 - Move Static Member.php b/05 - Refactoring/15 - Move Static Member.php
index b626c968..1aade7bd 100644
--- a/05 - Refactoring/15 - Move Static Member.php	
+++ b/05 - Refactoring/15 - Move Static Member.php	
@@ -20,6 +20,6 @@ public static function split($subject, $delimiter)
 class StringUtils {
 }
 
-// 2. Note that calls to Utils::split() have updated to StringUtils::split()
+// 2. Note that calls to Utils::split() have updated to StringUtils::split().
 $myArray = Utils::split('This is a test', ' ');
-$myCsvRecord = Utils::split('Maarten;JetBrains', ';');
\ No newline at end of file
+$myCsvRecord = Utils::split('Maarten;JetBrains', ';');
diff --git a/05 - Refactoring/Code/Code.php b/05 - Refactoring/Code/Code.php
index 0b26c350..575ce7d4 100644
--- a/05 - Refactoring/Code/Code.php	
+++ b/05 - Refactoring/Code/Code.php	
@@ -1,8 +1,8 @@
 <?php
 use Refactoring14\JetBrains\CoolPerson;
 
-require_once('../01 - Refactor This.php');
-require_once('../13 - Rename.php');
-require_once('../14 - Safe Delete.php');
+require_once '../01 - Refactor This.php';
+require_once '../13 - Rename.php';
+require_once '../14 - Safe Delete.php';
 
-$coolPerson = new CoolPerson('Maarten');
\ No newline at end of file
+$coolPerson = new CoolPerson('Maarten');
diff --git a/05 - Refactoring/Code/MoreCode.php b/05 - Refactoring/Code/MoreCode.php
index 2907549f..555c39ac 100644
--- a/05 - Refactoring/Code/MoreCode.php	
+++ b/05 - Refactoring/Code/MoreCode.php	
@@ -1,2 +1,2 @@
 <?php
-// more code should be here, but I am lazy
\ No newline at end of file
+// more code should be here, but I am lazy
diff --git a/06 - Debugging/01 - Simple Breakpoint.php b/06 - Debugging/01 - Simple Breakpoint.php
index d2528dcf..51e38561 100644
--- a/06 - Debugging/01 - Simple Breakpoint.php	
+++ b/06 - Debugging/01 - Simple Breakpoint.php	
@@ -16,7 +16,7 @@
 $name = 'Mikhail';
 
 for ($i = 0; $i < 5; $i++) {
-    // 2. Place a breakpoint on the following line of code
+    // 2. Place a breakpoint on the following line of code.
     $name = 'Person ' . $i;
 }
 
diff --git a/06 - Debugging/02 - Conditional Breakpoint.php b/06 - Debugging/02 - Conditional Breakpoint.php
index ff83de11..ea757fb4 100644
--- a/06 - Debugging/02 - Conditional Breakpoint.php	
+++ b/06 - Debugging/02 - Conditional Breakpoint.php	
@@ -13,11 +13,11 @@
 $output = array();
 for ($i = 0; $i < 5000; $i++) {
     // 1. Place a breakpoint on the following line of code.
-    // 2. Use the context menu on the breakpoint or use the keyboard shortcut, set the condition to: $i == 4355
+    // 2. Use the context menu on the breakpoint or use the keyboard shortcut, set the condition to: $i == 4355.
     $output[] = 'Person ' . $i;
 }
 
 // 3. Use the context menu to debug the current PHP script. This should launch the debugger.
 // 4. Our breakpoint is only hit when the $i variable equals 4355. With a regular breakpoint,
 //    we would have had to Resume the program +4000 times before we could check what happens when $i is a specific value.
-//    Conditional breakpoints are useful to test for specific values and only pause execution when these values are active.
\ No newline at end of file
+//    Conditional breakpoints are useful to test for specific values and only pause execution when these values are active.
diff --git a/06 - Debugging/03 - Breakpoints.php b/06 - Debugging/03 - Breakpoints.php
index f83bc8a4..84985920 100644
--- a/06 - Debugging/03 - Breakpoints.php	
+++ b/06 - Debugging/03 - Breakpoints.php	
@@ -27,6 +27,6 @@
 //    Edit the first breakpoint we have just added and log message to console.
 //    Edit the second breakpoint and only break when the first breakpoint in the current file has been hit.
 // 4. Use the context menu to debug the current PHP script. This should launch the debugger. The Console will now display
-//    a message similar to: Breakpoint reached: line 18 in 03 - Breakpoints.php
+//    a message similar to: Breakpoint reached: line 18 in 03 - Breakpoints.php.
 // 5. Resuming will break at the second breakpoint which has enabled itself because the first breakpoint has been hit.
-//    This is very useful if you want to do very detailed debugging but only when a first condition has been hit first.
\ No newline at end of file
+//    This is very useful if you want to do very detailed debugging but only when a first condition has been hit first.
diff --git a/06 - Debugging/04 - Exception Breakpoints.php b/06 - Debugging/04 - Exception Breakpoints.php
index 689fe416..f6d4614d 100644
--- a/06 - Debugging/04 - Exception Breakpoints.php	
+++ b/06 - Debugging/04 - Exception Breakpoints.php	
@@ -28,4 +28,4 @@
 //    Hover over the breakpoint to see the error type (Exception).
 throw new Exception('This is bad...');
 
-// 8. A good practice with Xdebug is to always add Exception Breakpoints so you are made aware of an error/Exception during debugging.
\ No newline at end of file
+// 8. A good practice with Xdebug is to always add Exception Breakpoints so you are made aware of an error/Exception during debugging.
diff --git a/06 - Debugging/05 - Debug Tool Window.php b/06 - Debugging/05 - Debug Tool Window.php
index fd0426e5..702079b0 100644
--- a/06 - Debugging/05 - Debug Tool Window.php	
+++ b/06 - Debugging/05 - Debug Tool Window.php	
@@ -11,7 +11,7 @@
 
 namespace Debugging3\JetBrains;
 
-require_once "./Code/Person.php";
+require_once 'Code/Person.php';
 
 use Debugging\JetBrains\Person;
 
@@ -39,5 +39,5 @@
 // 8. Let's say we wanted to test the code with a different name, without changing code.
 //    From the Debug Tool Window, expand $person and set the _name property to your name using the F2 keyboard shortcut.
 // 9. Continue execution once (F9) and see on the Console that your name is printed.
-// 10. From the Debug Tool Window, use the Evaluate Expression toolbar button (or Alt+F8) to change the name. E.g. evaluate: $person->setName('Mikhail')
-//     We can also run PHP code in here, for example evaluate $a = 1 + 1. The Evaluate Expression Window will show the result.
\ No newline at end of file
+// 10. From the Debug Tool Window, use the Evaluate Expression toolbar button (or Alt+F8) to change the name. E.g. evaluate: $person->setName('Mikhail').
+//     We can also run PHP code in here, for example evaluate $a = 1 + 1. The Evaluate Expression Window will show the result.
diff --git a/06 - Debugging/06 - Navigate through execution.php b/06 - Debugging/06 - Navigate through execution.php
index 5ca9f2f9..9463ffdb 100644
--- a/06 - Debugging/06 - Navigate through execution.php	
+++ b/06 - Debugging/06 - Navigate through execution.php	
@@ -2,7 +2,7 @@
 /**
  * Navigate through execution.
  *
- * Navigate through execution: Resume, Step Over, Step Into, Smart Step Into, Step out
+ * Navigate through execution: Resume, Step Over, Step Into, Smart Step Into, Step out.
  *
  * F9 (resume), F8 (step over), F7 (step into) (Windows/Linux)
  * Alt+Command+R (resume), F8 (step over), F7 (step into) (Mac OS X)
@@ -10,13 +10,13 @@
 
 namespace Debugging6\JetBrains;
 
-require_once "./Code/FruitRepository.php";
-require_once "./Code/Person.php";
+require_once 'Code/FruitRepository.php';
+require_once 'Code/Person.php';
 
 use Debugging\JetBrains\FruitRepository;
 use Debugging\JetBrains\Person;
 
-// 1. Place four breakpoints on the following four lines of code
+// 1. Place four breakpoints on the following four lines of code.
 $fruitRepository = new FruitRepository();
 $fruits = $fruitRepository->getAll();
 
@@ -29,7 +29,7 @@
 
 foreach ($people as $person) {
     foreach ($fruits as $fruit) {
-        // 2. Place a breakpoint on the following line of code
+        // 2. Place a breakpoint on the following line of code.
         echo $person->getName() . ", age " .  $person->getAge() . ", likes " . $fruit . "\r\n";
     }
 }
@@ -40,6 +40,6 @@
 // 5. Using Step Out, step back to where we were.
 // 6. Using Step Over, step to the next statement. Note that we are now evaluating statement by statement. Use Step Over again to navigate to the next statement.
 // 7. Using Resume, execute to the next breakpoint. Note that we stay in the loop, we want to get out. Disable the breakpoint and Resume.
-// 8. We are now at the line of code reading: echo $person->getName() . ", age " .  $person->getAge() . ", likes " . $fruit . "\r\n";
+// 8. We are now at the line of code reading: echo $person->getName() . ", age " .  $person->getAge() . ", likes " . $fruit . "\r\n";.
 //    There are two method calls here (getName() and getAge(). Use Smart Step-Into to step only into getAge() and skip getName().
-//    The IDE will ask us which statement to step into.
\ No newline at end of file
+//    The IDE will ask us which statement to step into.
diff --git a/06 - Debugging/07 - Debugging Web Application.php b/06 - Debugging/07 - Debugging Web Application.php
index 8ed2cbb0..5d0233f6 100644
--- a/06 - Debugging/07 - Debugging Web Application.php	
+++ b/06 - Debugging/07 - Debugging Web Application.php	
@@ -17,7 +17,7 @@
 //    Set the host to 127.0.0.1, port to 789.
 //    Set the document root to the folder in which the 07 - Debugging Web Application.php file lives.
 //    We can now host the current script by running the configuration.
-// 3. Run the configuration and open http://127.0.0.1:789/07 - Debugging Web Application.php
+// 3. Run the configuration and open http://127.0.0.1:789/07 - Debugging Web Application.php.
 // 4. In PhpStorm, use the Run | Start Listen for PHP Debug Connections menu.
 // 5. In the browser, use the Start Debugger bookmarklet. Click the "Show Greeting" button and note that PhpStorm informs about a new debug connection.
 //    Place some additional breakpoints and see that the Variables view in the Debug Tool Window now holds additional globals ($_COOKIE, $_GET, $_REQUEST).
@@ -42,4 +42,4 @@
 }
 ?>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/06 - Debugging/08 - Profiling.php b/06 - Debugging/08 - Profiling.php
index e3dd6c63..e33b2cad 100644
--- a/06 - Debugging/08 - Profiling.php	
+++ b/06 - Debugging/08 - Profiling.php	
@@ -8,8 +8,8 @@
 
 namespace Debugging8\JetBrains;
 
-require_once "./Code/FruitRepository.php";
-require_once "./Code/Person.php";
+require_once 'Code/FruitRepository.php';
+require_once 'Code/Person.php';
 
 use Debugging\JetBrains\FruitRepository;
 use Debugging\JetBrains\Person;
@@ -46,4 +46,4 @@
         // 2. Place a breakpoint on the following line of code
         echo $person->getName() . ", age " .  $person->getAge() . ", likes " . $fruit . "\r\n";
     }
-}
\ No newline at end of file
+}
diff --git a/06 - Debugging/Code/FruitRepository.php b/06 - Debugging/Code/FruitRepository.php
index a9eac883..e7a7818d 100644
--- a/06 - Debugging/Code/FruitRepository.php	
+++ b/06 - Debugging/Code/FruitRepository.php	
@@ -12,4 +12,4 @@ public function __construct() {
     public function getAll() {
         return $this->_fruits;
     }
-} 
\ No newline at end of file
+} 
diff --git a/06 - Debugging/Code/Person.php b/06 - Debugging/Code/Person.php
index bc03bf62..243bdecd 100644
--- a/06 - Debugging/Code/Person.php	
+++ b/06 - Debugging/Code/Person.php	
@@ -36,4 +36,4 @@ public function getAge()
     {
         return $this->_age;
     }
-}
\ No newline at end of file
+}
diff --git a/07 - Todo/01 - Todo.php b/07 - Todo/01 - Todo.php
index 314628e2..f8d0ee07 100644
--- a/07 - Todo/01 - Todo.php	
+++ b/07 - Todo/01 - Todo.php	
@@ -15,4 +15,4 @@
 // 3. Double-click or use the F4 shortcut to go to the first todo comment.
 // 4. Find the TODO comment in index.html. TODO works in every language supported by the IDE.
 // 5. Add a new todo item  by creating a comment followed by fixme or todo, for example:
-// todo: create a new comment below this line
\ No newline at end of file
+// todo: create a new comment below this line
diff --git a/07 - Todo/02 - Patterns.php b/07 - Todo/02 - Patterns.php
index ff01eef2..988635d5 100644
--- a/07 - Todo/02 - Patterns.php	
+++ b/07 - Todo/02 - Patterns.php	
@@ -20,4 +20,4 @@
 
 // verify[Maarten]: check if this line is highlighted and recognized by PhpStorm's todo system.
 
-// 3. Open the TODO Tool Window and see if these new patterns are shown in there.
\ No newline at end of file
+// 3. Open the TODO Tool Window and see if these new patterns are shown in there.
diff --git a/07 - Todo/03 - Filtering.php b/07 - Todo/03 - Filtering.php
index 5bb30a7b..cbf0ec8c 100644
--- a/07 - Todo/03 - Filtering.php	
+++ b/07 - Todo/03 - Filtering.php	
@@ -12,8 +12,8 @@
 
 // 1. Open the TODO tool window and make sure the Project scope is selected (show all TODO's in the current project).
 // 2. From the toolbar, click the filter icon and edit filters. Create two new filters:
-//     - Verify (Maarten), selecting the \bverify\[\bMaarten\b\].* pattern
-//     - Review, selecting the \breview\b.* pattern
-// 3. From the TODO tool window, set the filter to just show Review comments
-// 4. From the TODO tool window, set the filter to just show comments for Maarten
-// 5. In teams, setting patterns with usernames is really handy to filter actual tasks from the noise.
\ No newline at end of file
+//     - Verify (Maarten), selecting the \bverify\[\bMaarten\b\].* pattern.
+//     - Review, selecting the \breview\b.* pattern.
+// 3. From the TODO tool window, set the filter to just show Review comments.
+// 4. From the TODO tool window, set the filter to just show comments for Maarten.
+// 5. In teams, setting patterns with usernames is really handy to filter actual tasks from the noise.
diff --git a/07 - Todo/Code/index.html b/07 - Todo/Code/index.html
index 7810369a..84b55baa 100644
--- a/07 - Todo/Code/index.html	
+++ b/07 - Todo/Code/index.html	
@@ -6,4 +6,4 @@
 <body>
 <!-- TODO: add contents here -->
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/08 - Testing/01 - Writing Tests.php b/08 - Testing/01 - Writing Tests.php
index c0dc5706..afb74d24 100644
--- a/08 - Testing/01 - Writing Tests.php	
+++ b/08 - Testing/01 - Writing Tests.php	
@@ -12,8 +12,8 @@
 
 // 1. Create a new PHPUnit test file. From the navigation bar, create a new file using the PHPUnit template.
 //    Note that another way of creating a test is to use the Go to Test navigation:
-//      - Navigate to the Queue class
-//      - Use the Go to Test navigation to either go to test or create a new test
+//      - Navigate to the Queue class.
+//      - Use the Go to Test navigation to either go to test or create a new test.
 //
 // 2. For Fully Qualified name, search for the Queue class.
 //    All other parameters for the unit test class can be kept at their defaults.
@@ -25,11 +25,10 @@
 //
 //    }
 //
-// 3. Add a function called setUp() which sets up a new Queue in a new field called $_queue;
+// 3. Add a function called setUp() which sets up a new Queue in a new field called $_queue;.
 //    To generate the setUp() function, we can use the Generate | Override method action (Alt+Insert / Command+N).
 //
 //    This is what the class should look like:
-//    (note: the Code | Comment With Line Comment menu may be handy if you are copy/pasting the below code)
 //
 //   class QueueTest extends \PHPUnit_Framework_TestCase {
 //       /** @var Queue */
@@ -40,7 +39,9 @@
 //       }
 //   }
 //
-// 4. Add a first test, verifying the enqueue() method. This can be done using Alt+Insert / Command+N
+//    Note: the Code | Comment With Line Comment menu may be handy if you are copy/pasting the above code.
+//
+// 4. Add a first test, verifying the enqueue() method. This can be done using Alt+Insert / Command+N.
 //
 //  public function testEnqueueIncreasesItemCount() {
 //      $this->_queue->enqueue('test');
@@ -48,4 +49,4 @@
 //  }
 //
 // 5. From the test, navigate back to the Queue class using Navigate to Test Subject.
-//    This is the same keyboard shortcut as Go to Test.
\ No newline at end of file
+//    This is the same keyboard shortcut as Go to Test.
diff --git a/08 - Testing/02 - Running Tests.php b/08 - Testing/02 - Running Tests.php
index 928fba8c..9b6e030c 100644
--- a/08 - Testing/02 - Running Tests.php	
+++ b/08 - Testing/02 - Running Tests.php	
@@ -29,4 +29,4 @@
 //      so that the tests can be run.
 // 4. Execute the Run Configuration.
 // 5. The Test tool window below shows test results. Using the context menu,
-//    additional statistics such as the number of assertions can be viewed.
\ No newline at end of file
+//    additional statistics such as the number of assertions can be viewed.
diff --git a/08 - Testing/03 - Test Driven Development.php b/08 - Testing/03 - Test Driven Development.php
index 04f84d10..1afc3718 100644
--- a/08 - Testing/03 - Test Driven Development.php	
+++ b/08 - Testing/03 - Test Driven Development.php	
@@ -25,7 +25,7 @@
 //
 //    In other words: if items are in queue, peek() should return true. It should return false if no items are in queue.
 //
-// 2. PhpStorm displays an inspection on the peek() method: Method peek() not found in class Queue
+// 2. PhpStorm displays an inspection on the peek() method: Method peek() not found in class Queue.
 //    Using Alt+Enter, create the method.
 //    Implement the method.
-// 3. Run unit tests and see tests are all passing.
\ No newline at end of file
+// 3. Run unit tests and see tests are all passing.
diff --git a/08 - Testing/04 - Code Coverage.php b/08 - Testing/04 - Code Coverage.php
index 4d21538d..0c340f9f 100644
--- a/08 - Testing/04 - Code Coverage.php	
+++ b/08 - Testing/04 - Code Coverage.php	
@@ -8,6 +8,6 @@
 namespace Testing\JetBrains;
 
 // 1. Run the unit tests created earlier with Code Coverage enabled.
-//    This can be done using the "Run tests with Coverage" action (try Search Everywhere or the toolbar)
+//    This can be done using the "Run tests with Coverage" action (try Search Everywhere or the toolbar).
 // 2. Explore code coverage results from the Code Coverage tool window.
 //    Using F4 or double-clicking, navigate to Queue.php and see which lines of code are tested and which ones are not.
diff --git a/08 - Testing/05 - JavaScript testing.js b/08 - Testing/05 - JavaScript testing.js
index ef14b3ec..7dbcedb8 100644
--- a/08 - Testing/05 - JavaScript testing.js	
+++ b/08 - Testing/05 - JavaScript testing.js	
@@ -2,19 +2,19 @@
  * JavaScript Unit Testing (using Karma)
  */
 
-// 1. Install the Karma plugin (IDE Settings | Plugins)
+// 1. Install the Karma plugin (IDE Settings | Plugins).
 // 2. Install the Karma test runner on your system using NPM:
 //      npm install -g karma
 //      (or use Project Settings | Node.js and NPM, search Karma and add the -g install option)
 // 3. Make sure a Karma configuration is created. Either rename karma.conf.js.sample to karma.conf.js or set it up manually.
 //
-//    Manual steps: Open a terminal (Tools | Open Terminal) and initialize karma in the current folder
+//    Manual steps: Open a terminal (Tools | Open Terminal) and initialize karma in the current folder.
 //      cd "08 - Testing"
 //      karma init
 //
-//    - Select the test framework to use, we'll go with jasmine
-//    - Select "no" on using Require.js
-//    - Select the browser to capture
+//    - Select the test framework to use, we'll go with jasmine.
+//    - Select "no" on using Require.js.
+//    - Select the browser to capture.
 //    - For test location, enter *.js so Karma will run all tests in the current folder.
 //    - For excluding files, leave an empty string. More info can be found in the Karma documentation.
 //    - For automatically running, select "no". When enabled, this will automatically run unit tests whenever
@@ -31,4 +31,4 @@ describe("Sample test suite", function() {
     it("a boolean false should be false", function() {
         expect(false).toBe(false);
     });
-});
\ No newline at end of file
+});
diff --git a/08 - Testing/Code/Bootstrap.php b/08 - Testing/Code/Bootstrap.php
index e558ca09..b5e9b6ac 100644
--- a/08 - Testing/Code/Bootstrap.php	
+++ b/08 - Testing/Code/Bootstrap.php	
@@ -1,4 +1,4 @@
 <?php
 namespace Testing\JetBrains;
 
-require_once dirname(__FILE__) . '/Queue.php';
\ No newline at end of file
+require_once dirname(__FILE__) . '/Queue.php';
diff --git a/08 - Testing/Code/Queue.php b/08 - Testing/Code/Queue.php
index 436918e9..f95384cb 100644
--- a/08 - Testing/Code/Queue.php	
+++ b/08 - Testing/Code/Queue.php	
@@ -16,4 +16,4 @@ public function enqueue($item) {
     public function dequeue() {
         return array_shift($this->_store);
     }
-}
\ No newline at end of file
+}
diff --git a/08 - Testing/QueueTest.txt b/08 - Testing/QueueTest.txt
index 0c1ffb60..bd4ec54a 100644
--- a/08 - Testing/QueueTest.txt	
+++ b/08 - Testing/QueueTest.txt	
@@ -26,4 +26,4 @@ class QueueTest extends \PHPUnit_Framework_TestCase {
         $result = $this->_queue->peek();
         $this->assertTrue($result);
     }
-}
\ No newline at end of file
+}
diff --git a/09 - Version Control/00 - Preparations.txt b/09 - Version Control/00 - Preparations.txt
index ffc86688..8cfc4ec7 100644
--- a/09 - Version Control/00 - Preparations.txt	
+++ b/09 - Version Control/00 - Preparations.txt	
@@ -6,4 +6,4 @@ Since the Workshop project comes from GitHub, we will have to remove all existin
 1. Open the current project's root folder outside PhpStorm and remove the .git folder at the root.
 2. From the Project Settings | Version Control, make sure that all VCS bindings are removed.
 3. From the Project Settings | Version Control | Git, make sure the path to a Git executable is specified.
-4. You are now good to go, the project should no longer be linked to any VCS.
\ No newline at end of file
+4. You are now good to go, the project should no longer be linked to any VCS.
diff --git a/09 - Version Control/01 - Enable VCS integration.txt b/09 - Version Control/01 - Enable VCS integration.txt
index 640f56c0..a4c284c9 100644
--- a/09 - Version Control/01 - Enable VCS integration.txt	
+++ b/09 - Version Control/01 - Enable VCS integration.txt	
@@ -4,9 +4,9 @@ Telling the IDE that the project is under a VCS system.
 
 1. Explore the VCS menu.
    We can checkout code from an existing VCS like Git, Mercurial, Subversion, ...
-   We can import the current project into a VCS system or share it on GitHub
-   We can enable VCS integration
+   We can import the current project into a VCS system or share it on GitHub.
+   We can enable VCS integration.
 
 2. Use the VCS | Enable VCS integration menu and specify the project will be in a Git repository.
    This will create a .git folder in the project. In the Project Tool Window, notice the color of all files changes.
-   The reason for that is the file is not yet under source control.
\ No newline at end of file
+   The reason for that is the file is not yet under source control.
diff --git a/09 - Version Control/02 - VCS operations.txt b/09 - Version Control/02 - VCS operations.txt
index ce9bdb0c..dd364768 100644
--- a/09 - Version Control/02 - VCS operations.txt	
+++ b/09 - Version Control/02 - VCS operations.txt	
@@ -10,4 +10,4 @@ Ctrl+V (Mac OS X)
 2. In Git, this does not mean the file is in the VS now: it's in the changeset.
    Using the VCS Operations popup, add all other files in the project as well.
    Note you can use the popup on any folder.
-3. All file should be green now, meaning they are added to the current changeset.
\ No newline at end of file
+3. All file should be green now, meaning they are added to the current changeset.
diff --git a/09 - Version Control/03 - Committing Changes.txt b/09 - Version Control/03 - Committing Changes.txt
index aabfb9be..a6fc74f5 100644
--- a/09 - Version Control/03 - Committing Changes.txt	
+++ b/09 - Version Control/03 - Committing Changes.txt	
@@ -18,4 +18,4 @@ Command+K (Mac OS X)
    in the left gutter, denoting a change in the line of code since the last VCS commit.
    In the Project Tool Window, the file color also changes to denote the file has been changed.
 6. Add a line of text below. Note that the editor now displays green in the left gutter, meaning the line has been added.
-7. Commit all changes again and give the commit a descriptive name
\ No newline at end of file
+7. Commit all changes again and give the commit a descriptive name.
diff --git a/09 - Version Control/04 - Viewing history.txt b/09 - Version Control/04 - Viewing history.txt
index 150350b4..9cb15dc6 100644
--- a/09 - Version Control/04 - Viewing history.txt	
+++ b/09 - Version Control/04 - Viewing history.txt	
@@ -10,4 +10,4 @@ Command+9 (Mac OS X)
 2. Explore the history. You can see the commit message, files that have been changes, the author and when the change happened.
 3. From the toolbar, you can filter on user, date and search for keywords in commit messages.
 4. Select the last commit (the top one in the list). From the files on the right, open a "diff" with the previous commit (Ctrl+D or Command+D).
-   This shows all changes in the file compared with the previous commit.
\ No newline at end of file
+   This shows all changes in the file compared with the previous commit.
diff --git a/09 - Version Control/05 - Git Mercurial Push.txt b/09 - Version Control/05 - Git Mercurial Push.txt
index 4d37118f..cb0acb96 100644
--- a/09 - Version Control/05 - Git Mercurial Push.txt	
+++ b/09 - Version Control/05 - Git Mercurial Push.txt	
@@ -3,7 +3,7 @@ Git/Mercurial: Push/Pull
 Persist local copy of VCS repository to remote copy.
 
 1. Let's setup a VCS "server" using Git. Using Tools | Open Terminal..., navigate to a temporary folder on your computer.
-   In that folder, create a new folder (name does not matter, just remember it)
+   In that folder, create a new folder (name does not matter, just remember it).
    Open the newly created folder and run: git init
    This will make the folder a Git repository we can work with in further exercises.
 2. We want to push our local copy of the VCS to this "server". First, we need to add a "remote".
@@ -11,5 +11,5 @@ Persist local copy of VCS repository to remote copy.
    Enter the command: git remote add origin <path we created in step 1>
    For example: git remote add origin C:\Temp\repository
 3. Push changes to the remote repository using the VCS Operations popup. Since we haven't pushed before, the IDE shows that all changesets will be pushed.
-4. When working with Git/Mercurial, make sure to push to a different reposiotry from time to time, for example on www.github.com.
-   This will ensure an off-computer copy of the entire code history.
\ No newline at end of file
+4. When working with Git/Mercurial, make sure to push to a different repository from time to time, for example on www.github.com.
+   This will ensure an off-computer copy of the entire code history.
diff --git a/09 - Version Control/06 - Changelists.txt b/09 - Version Control/06 - Changelists.txt
index daddda56..8f51c215 100644
--- a/09 - Version Control/06 - Changelists.txt	
+++ b/09 - Version Control/06 - Changelists.txt	
@@ -13,4 +13,4 @@ Command+9 (Mac OS X)
    Set the new changelist as the active changelist.
 4. Make some changes to a different file. In the changes tool window, note the change is correlated to the newly created changelist.
 5. Commit the current changelist to source control. The Commit Changes window will have the commit message filled with the name of the changelist.
-   After commit, we can switch back to the original changelist and remove the one we just committed to source control.
\ No newline at end of file
+   After commit, we can switch back to the original changelist and remove the one we just committed to source control.
diff --git a/09 - Version Control/07 - Local History.php b/09 - Version Control/07 - Local History.php
index cc90d9de..20b2ba97 100644
--- a/09 - Version Control/07 - Local History.php	
+++ b/09 - Version Control/07 - Local History.php	
@@ -14,7 +14,7 @@
 //    Code: $name = ucfirst($name);
 //    Save the file.
 
-// 3. From the VCS Operations popup, Show History (make sure to pick the entry under "Local History")
+// 3. From the VCS Operations popup, Show History (make sure to pick the entry under "Local History").
 //    This opens a new window in which local changes are shown for the current file.
 //    We can see we have changed a line of code and added a line of code.
 // 4. Revert the last change we did from the Local History.
diff --git a/10 - Database/01 - Connecting to a database.txt b/10 - Database/01 - Connecting to a database.txt
index d0b64f74..eae41a9f 100644
--- a/10 - Database/01 - Connecting to a database.txt	
+++ b/10 - Database/01 - Connecting to a database.txt	
@@ -2,10 +2,10 @@ Connecting to a database (server)
 
 Connecting to MySQL, DB2, Derby, SQL Server, Oracle, PostgreSQL, Sybase, H2, sqlite, Google, ...
 
-1. Open the Database tool window (use Search Everywhere)
+1. Open the Database tool window (use Search Everywhere).
 2. Create a new database connection. If you have MySQL installed, use MySQL.
 3. Name the connection and connect to the MySQL server. Download MySQL driver files if they are not downloaded yet.
    If you have a database in which to run these exercises, enter the database name as well. Otherwise leave the database
    name blank, we'll create one in a minute.
 4. After saving the connection, expand the nodes in the Database tool window and see which databases, tables, ...
-   you have access to.
\ No newline at end of file
+   you have access to.
diff --git a/10 - Database/02 - Database console.txt b/10 - Database/02 - Database console.txt
index 82a64521..8a700c65 100644
--- a/10 - Database/02 - Database console.txt	
+++ b/10 - Database/02 - Database console.txt	
@@ -41,4 +41,4 @@ WHERE country.name = ?
 
 11. Execute the statement. The IDE prompts for the parameter which is noted in the query as ? (can also be :country or similar).
     In the dialog, enter 'Belgium' as the value (including quotes).
-12. Explore the options in the results tool window.
\ No newline at end of file
+12. Explore the options in the results tool window.
diff --git a/10 - Database/03 - Table Editor.txt b/10 - Database/03 - Table Editor.txt
index d211fc6d..5aba2be0 100644
--- a/10 - Database/03 - Table Editor.txt	
+++ b/10 - Database/03 - Table Editor.txt	
@@ -13,4 +13,4 @@ F4 (Windows/Linux/Mac OS X)
    Note the autocompletion support.
    Click the View Query button to see the query that has been generated.
 5. Select a value in the city_id column and hit Ctrl+Q (F1) to see how the value is referenced in other tables.
-5. Rows can be exported. Export the rows as INSERT statements by using the toolbar buttons.
\ No newline at end of file
+5. Rows can be exported. Export the rows as INSERT statements by using the toolbar buttons.
diff --git a/10 - Database/04 - Create New Table.txt b/10 - Database/04 - Create New Table.txt
index 2e8160c7..9bbbd62e 100644
--- a/10 - Database/04 - Create New Table.txt	
+++ b/10 - Database/04 - Create New Table.txt	
@@ -18,4 +18,4 @@ CREATE TABLE workshop.attendee
 2. In the Database tool window, find the attendee.person_id column and create a foreign key to person.person_id.
    Enter "person" as the table name. The IDE will determine person__id is the column that should be used for the foreign key.
 3. Update the workshop_database.sql file with the current tables that are available in the database.
-   This can be done by selecting the workshop database and using the Copy DDL action (Ctrl+Shift+C / Command+Shift+C)
\ No newline at end of file
+   This can be done by selecting the workshop database and using the Copy DDL action (Ctrl+Shift+C / Command+Shift+C).
diff --git a/10 - Database/05 - Database tools in PHP.php b/10 - Database/05 - Database tools in PHP.php
index d0dd3daf..f3684b45 100644
--- a/10 - Database/05 - Database tools in PHP.php	
+++ b/10 - Database/05 - Database tools in PHP.php	
@@ -3,16 +3,16 @@
  * Database tools in PHP
  */
 
-// 1. Create a new variable $query which holds the query "SELECT * FROM person"
-//    Make sure to manually type the query and note the autocompletion support (use Ctrl+Space right after FROM)
+// 1. Create a new variable $query which holds the query "SELECT * FROM person".
+//    Make sure to manually type the query and note the autocompletion support (use Ctrl+Space right after FROM).
 
 $query = "";
 
-// 2. Make the query a bit more complicated. Remember the JOIN smart completion? Use Ctrl+Shift+Space after the ON
+// 2. Make the query a bit more complicated. Remember the JOIN smart completion? Use Ctrl+Shift+Space after the ON.
 
 $query = "SELECT person.name, city.name as city, country.name as nationality
             FROM person
               INNER JOIN city ON person.city_id = city.city_id
               INNER JOIN country ON ";
 
-// 3. Alt+Enter on the above query and Run it in Console.
\ No newline at end of file
+// 3. Alt+Enter on the above query and Run it in Console.
diff --git a/10 - Database/workshop_database.sql b/10 - Database/workshop_database.sql
index 4fca6b28..7e4b35b1 100644
--- a/10 - Database/workshop_database.sql	
+++ b/10 - Database/workshop_database.sql	
@@ -45,4 +45,4 @@ INSERT INTO city (city_id, name, country_id) VALUES (4, 'Malaga', 3);
 
 INSERT INTO person (person_id, name, city_id, nationality_country_id) VALUES (1, 'Maarten', 1, 1);
 INSERT INTO person (person_id, name, city_id, nationality_country_id) VALUES (2, 'Mikhail', 2, 2);
-INSERT INTO person (person_id, name, city_id, nationality_country_id) VALUES (3, 'Hadi', 4, 4);
\ No newline at end of file
+INSERT INTO person (person_id, name, city_id, nationality_country_id) VALUES (3, 'Hadi', 4, 4);
diff --git a/11 - Deployment/01 - Remote Host.txt b/11 - Deployment/01 - Remote Host.txt
index 0b67fc43..dd7c3d2f 100644
--- a/11 - Deployment/01 - Remote Host.txt	
+++ b/11 - Deployment/01 - Remote Host.txt	
@@ -12,4 +12,4 @@ Copy files and folders back and forth between local project and server.
    to run remote unit tests or remote debugging.
    In the Mappings tab, specify the content root on the server. This can be a different subfolder or just /.
 4. Browse the remote host and copy some files from the current project to the remote server.
-   This can be done using drag and drop, or using the context menu.
\ No newline at end of file
+   This can be done using drag and drop, or using the context menu.
diff --git a/11 - Deployment/02 - Integration with VCS.txt b/11 - Deployment/02 - Integration with VCS.txt
index 9a33c299..56cb429c 100644
--- a/11 - Deployment/02 - Integration with VCS.txt	
+++ b/11 - Deployment/02 - Integration with VCS.txt	
@@ -6,4 +6,4 @@ Upload files to server when committing to source control.
 2. Commit pending changes to the VCS. In the commit dialog, set the "Upload files to"
    dropdown to the server created earlier.
 
-   Once files are committed to the VCS, PhpStorm will also upload changes to the remote host.
\ No newline at end of file
+   Once files are committed to the VCS, PhpStorm will also upload changes to the remote host.
diff --git a/12 - Tools/01 - REST Client.txt b/12 - Tools/01 - REST Client.txt
index ec23fc52..1fcb38c4 100644
--- a/12 - Tools/01 - REST Client.txt	
+++ b/12 - Tools/01 - REST Client.txt	
@@ -4,7 +4,7 @@ The built-in REST client allows testing web API's. Build requests, inspect respo
 
 1. Use the Tools | Test RESTful Web Service menu to open the REST Client tool window.
 2. Create a request which fetches your user information from GitHub.
-   Specify the HTTP method to be GET, the host will be https://api.github.com, the path /user
+   Specify the HTTP method to be GET, the host will be https://api.github.com, the path /user.
    In the headers section, add an Accept: application/json header.
    Note that you can specify a request body, text, file upload as well.
 3. Run the request. GitHub responds with the fact that authentication is required.
@@ -14,4 +14,4 @@ The built-in REST client allows testing web API's. Build requests, inspect respo
 6. Open the Response Headers tab and check the remaining rate limit.
 7. Requests can be replayed from the toolbar.
 8. Requests can be imported and exported from the toolbar. Import the samplerequest.xml,
-   add an authorization header and see your GitHub repositories are listed.
\ No newline at end of file
+   add an authorization header and see your GitHub repositories are listed.
diff --git a/12 - Tools/02 - Composer.txt b/12 - Tools/02 - Composer.txt
index f48893a6..e38e0ff2 100644
--- a/12 - Tools/02 - Composer.txt	
+++ b/12 - Tools/02 - Composer.txt	
@@ -10,4 +10,4 @@ Create new project using Composer project type. Command Line Tools.
 3. Add a dependency on phpoffice/phpexcel. Install the dev-master version.
 4. Note the vendor folder has been added to the project, in which Composer generated an autoload.php.
 5. (optional) Remember unit testing? The autoload.php file can be used to load PHPUnit if it is installed through Composer.
-   Try installing PHPUnit through Composer and run PHP unit tests using this approach.
\ No newline at end of file
+   Try installing PHPUnit through Composer and run PHP unit tests using this approach.
diff --git a/12 - Tools/03 - Command Line Tools.txt b/12 - Tools/03 - Command Line Tools.txt
index d7ee3fbe..5270aba0 100644
--- a/12 - Tools/03 - Command Line Tools.txt	
+++ b/12 - Tools/03 - Command Line Tools.txt	
@@ -37,4 +37,4 @@ Shift+Command+X (Mac OS X)
 </framework>
 
 
-6. Invoke the newly create "hw" tool from the Command Line Tools console. Note autocompletion information is available now.
\ No newline at end of file
+6. Invoke the newly create "hw" tool from the Command Line Tools console. Note autocompletion information is available now.
diff --git a/12 - Tools/04 - Vagrant.txt b/12 - Tools/04 - Vagrant.txt
index dc4e7dd5..a31e91ca 100644
--- a/12 - Tools/04 - Vagrant.txt	
+++ b/12 - Tools/04 - Vagrant.txt	
@@ -11,4 +11,4 @@ Note: this exercise requires Vagrant and a virtualization platform to be install
 3. Once the machine is up, pause it using Tools | Vagrant | Suspend.
 4. Once the machine is paused, resume it using Tools | Vagrant | Resume.
 5. We will use the Vagrant machine in the next exercise. Keep it running, remember it can be destroyed
-   using Tools | Vagrant | Destroy.
\ No newline at end of file
+   using Tools | Vagrant | Destroy.
diff --git a/12 - Tools/06 - Remote SSH External Tools.txt b/12 - Tools/06 - Remote SSH External Tools.txt
index 6ea412bb..571297da 100644
--- a/12 - Tools/06 - Remote SSH External Tools.txt	
+++ b/12 - Tools/06 - Remote SSH External Tools.txt	
@@ -16,4 +16,4 @@ For example, we may want to run a shell script which flushes the current cache,
 
 Note:
   To store connection settings, project settings | Deployment and add a new server. The server type should be SFTP.
-  After providing connection details, the server will be visible whenever Tools | Start SSH Session... is invoked.
\ No newline at end of file
+  After providing connection details, the server will be visible whenever Tools | Start SSH Session... is invoked.
diff --git a/12 - Tools/07 - Local Terminal.txt b/12 - Tools/07 - Local Terminal.txt
index 7a0a8b64..c23e7b53 100644
--- a/12 - Tools/07 - Local Terminal.txt	
+++ b/12 - Tools/07 - Local Terminal.txt	
@@ -5,4 +5,4 @@ Provide a local terminal. Works on any platform supported by PhpStorm.
 1. Open the local terminal using Tools | Open Terminal...
 2. Browse around on your system.
 3. Open a new terminal session clicking the + button in the toolbar.
-4. The IDE supports multiple simultaneous sessions.
\ No newline at end of file
+4. The IDE supports multiple simultaneous sessions.
diff --git a/12 - Tools/helloworld.bat b/12 - Tools/helloworld.bat
index 66974ec0..83ea2406 100644
--- a/12 - Tools/helloworld.bat	
+++ b/12 - Tools/helloworld.bat	
@@ -1 +1 @@
-@echo Hello %2
\ No newline at end of file
+@echo Hello %1
diff --git a/12 - Tools/helloworld.sh b/12 - Tools/helloworld.sh
index 0a343f49..5556733b 100644
--- a/12 - Tools/helloworld.sh	
+++ b/12 - Tools/helloworld.sh	
@@ -1,2 +1,2 @@
 #!/bin/bash
-echo 'Hello ' $2
\ No newline at end of file
+echo 'Hello' $1
diff --git a/12 - Tools/samplerequest.xml b/12 - Tools/samplerequest.xml
index 8e0b8028..f8ec0892 100644
--- a/12 - Tools/samplerequest.xml	
+++ b/12 - Tools/samplerequest.xml	
@@ -23,4 +23,4 @@
   <option name="isFileUpload" value="false" />
   <option name="textToSend" value="" />
   <option name="filesToSend" value="" />
-</RestClientRequest>
\ No newline at end of file
+</RestClientRequest>
diff --git a/99 - Miscellaneous/Refactoring/README.md b/99 - Miscellaneous/Refactoring/README.md
index beb1df45..c74dc37d 100644
--- a/99 - Miscellaneous/Refactoring/README.md	
+++ b/99 - Miscellaneous/Refactoring/README.md	
@@ -1,2 +1,2 @@
 # Refactoring
-This folder contains a sample project that is a perfect candidate for trying various refactorings in real-life. Try cleaning the code a bit!
\ No newline at end of file
+This folder contains a sample project that is a perfect candidate for trying various refactorings in real-life. Try cleaning the code a bit!
diff --git a/99 - Miscellaneous/Refactoring/addpage.php b/99 - Miscellaneous/Refactoring/addpage.php
index b4700598..240b960c 100644
--- a/99 - Miscellaneous/Refactoring/addpage.php	
+++ b/99 - Miscellaneous/Refactoring/addpage.php	
@@ -1,8 +1,8 @@
 <?php
-require_once("config.php");
-require_once(SITE_PATH . "/includes/session.php");
-require_once(SITE_PATH . "/includes/connectDB.php");
-include(SITE_PATH . "/includes/header.php");
+require_once 'config.php';
+require_once SITE_PATH . '/includes/session.php';
+require_once SITE_PATH . '/includes/connectDB.php';
+include SITE_PATH . '/includes/header.php';
 confirm_is_admin($session);
 
 if (isset($_POST['submit'])) {
@@ -53,5 +53,5 @@
     </form>
 </div>
 </div> <!-- End of outer-wrapper which opens in header.php -->
-<?php include(SITE_PATH . "/includes/footer.php"); ?>
+<?php include SITE_PATH . '/includes/footer.php'; ?>
 
diff --git a/99 - Miscellaneous/Refactoring/config.php b/99 - Miscellaneous/Refactoring/config.php
index 803cf602..21b8f806 100644
--- a/99 - Miscellaneous/Refactoring/config.php	
+++ b/99 - Miscellaneous/Refactoring/config.php	
@@ -12,4 +12,4 @@
     define('SITE_PATH', dirname(realpath(__FILE__)));
 
     set_include_path(get_include_path() . PATH_SEPARATOR . SITE_PATH);
-}
\ No newline at end of file
+}
diff --git a/99 - Miscellaneous/Refactoring/deletepage.php b/99 - Miscellaneous/Refactoring/deletepage.php
index 4348adb9..6a792830 100644
--- a/99 - Miscellaneous/Refactoring/deletepage.php	
+++ b/99 - Miscellaneous/Refactoring/deletepage.php	
@@ -1,7 +1,7 @@
 <?php
-require_once("config.php");
-require_once(SITE_PATH . "/includes/connectDB.php");
-include(SITE_PATH . "/includes/header.php");
+require_once 'config.php';
+require_once SITE_PATH . '/includes/connectDB.php';
+include SITE_PATH . '/includes/header.php';
 confirm_is_admin($session);
 
 if (isset($_POST['submit'])) {
@@ -65,4 +65,4 @@
     </form>
 </div>
 </div> <!-- End of outer-wrapper which opens in header.php -->
-<?php include(SITE_PATH . "/includes/footer.php"); ?>
+<?php include SITE_PATH . '/includes/footer.php'; ?>
diff --git a/99 - Miscellaneous/Refactoring/editpage.php b/99 - Miscellaneous/Refactoring/editpage.php
index 3c494b6d..3215aee5 100644
--- a/99 - Miscellaneous/Refactoring/editpage.php	
+++ b/99 - Miscellaneous/Refactoring/editpage.php	
@@ -1,8 +1,8 @@
 <?php
-require_once("config.php");
-require_once(SITE_PATH . "/includes/session.php");
-require_once(SITE_PATH . "/includes/connectDB.php");
-include(SITE_PATH . "/includes/header.php");
+require_once 'config.php';
+require_once SITE_PATH . '/includes/session.php';
+require_once SITE_PATH . '/includes/connectDB.php';
+include SITE_PATH . '/includes/header.php';
 confirm_is_admin($session);
 
 $pageId = null;
@@ -82,5 +82,5 @@
     </form>
 </div>
 </div> <!-- End of outer-wrapper which opens in header.php -->
-<?php include(SITE_PATH . "/includes/footer.php"); ?>
+<?php include SITE_PATH . '/includes/footer.php'; ?>
 
diff --git a/99 - Miscellaneous/Refactoring/functions/database.php b/99 - Miscellaneous/Refactoring/functions/database.php
index b65d2d55..c81f9b81 100644
--- a/99 - Miscellaneous/Refactoring/functions/database.php	
+++ b/99 - Miscellaneous/Refactoring/functions/database.php	
@@ -20,7 +20,7 @@ function prep_DB_content()
 /**
  * Creates database tables.
  *
- * @param $databaseConnection mysqli Database connection.
+ * @param mysqli $databaseConnection Database connection.
  */
 function create_tables($databaseConnection)
 {
@@ -41,8 +41,8 @@ function create_tables($databaseConnection)
 /**
  * Create roles.
  *
- * @param $databaseConnection mysqli Database connection.
- * @param $admin_role_id int Role for the administrator user.
+ * @param mysqli $databaseConnection Database connection.
+ * @param int $admin_role_id Role for the administrator user.
  */
 function create_roles($databaseConnection, $admin_role_id)
 {
@@ -60,8 +60,8 @@ function create_roles($databaseConnection, $admin_role_id)
 /**
  * Create administrator.
  *
- * @param $databaseConnection mysqli Database connection.
- * @param $admin_role_id int Role for the administrator user.
+ * @param mysqli $databaseConnection Database connection.
+ * @param int $admin_role_id Role for the administrator user.
  */
 function create_admin($databaseConnection, $admin_role_id)
 {
@@ -93,7 +93,7 @@ function create_admin($databaseConnection, $admin_role_id)
 /**
  * Adds homepage contents to the database.
  *
- * @param $databaseConnection mysqli Database connection.
+ * @param mysqli $databaseConnection Database connection.
  */
 function create_homepage($databaseConnection)
 {
@@ -127,4 +127,4 @@ function create_homepage($databaseConnection)
         $statement_insert_page->execute();
         $statement_insert_page->store_result();
     }
-}
\ No newline at end of file
+}
diff --git a/99 - Miscellaneous/Refactoring/images/Thumbs.db b/99 - Miscellaneous/Refactoring/images/Thumbs.db
deleted file mode 100644
index 28337e92..00000000
Binary files a/99 - Miscellaneous/Refactoring/images/Thumbs.db and /dev/null differ
diff --git a/99 - Miscellaneous/Refactoring/includes/classes/Session.php b/99 - Miscellaneous/Refactoring/includes/classes/Session.php
index 4039352b..b53a181d 100644
--- a/99 - Miscellaneous/Refactoring/includes/classes/Session.php	
+++ b/99 - Miscellaneous/Refactoring/includes/classes/Session.php	
@@ -12,7 +12,7 @@ class Session {
     /**
      * Instantiates a new Session.
      *
-     * @param $store array Store of session data.
+     * @param array $store Store of session data.
      */
     function __construct(&$store)
     {
@@ -22,7 +22,7 @@ function __construct(&$store)
     /**
      * Checks if a value exists in session.
      *
-     * @param $key string Key of the session item.
+     * @param string $key Key of the session item.
      * @return bool True if item exists, false if otherwise.
      */
     public function has($key) {
@@ -32,7 +32,7 @@ public function has($key) {
     /**
      * Gets a value from session.
      *
-     * @param $key string Key of the session item.
+     * @param string $key Key of the session item.
      * @return mixed|null Session item or null if it does not exist.
      */
     public function get($key) {
@@ -45,12 +45,12 @@ public function get($key) {
     /**
      * Sets a value from session.
      *
-     * @param $key string Key of the session item.
-     * @param $value mixed Value of the session item.
+     * @param string $key Key of the session item.
+     * @param mixed $value Value of the session item.
      * @return Session Fluent interface.
      */
     public function set($key, $value) {
         $this->_store[$key] = $value;
         return $this;
     }
-} 
\ No newline at end of file
+} 
diff --git a/99 - Miscellaneous/Refactoring/includes/closeDB.php b/99 - Miscellaneous/Refactoring/includes/closeDB.php
index 27a1d578..00835356 100644
--- a/99 - Miscellaneous/Refactoring/includes/closeDB.php	
+++ b/99 - Miscellaneous/Refactoring/includes/closeDB.php	
@@ -1,2 +1,2 @@
 <?php
-mysqli_close($databaseConnection);
\ No newline at end of file
+mysqli_close($databaseConnection);
diff --git a/99 - Miscellaneous/Refactoring/includes/connectDB.php b/99 - Miscellaneous/Refactoring/includes/connectDB.php
index 9a08b47e..b36c0075 100644
--- a/99 - Miscellaneous/Refactoring/includes/connectDB.php	
+++ b/99 - Miscellaneous/Refactoring/includes/connectDB.php	
@@ -1,5 +1,5 @@
 <?php
-require_once(SITE_PATH . "/functions/database.php");
+require_once SITE_PATH . '/functions/database.php';
 
 // Create database connection
 $databaseConnection = new mysqli(DB_HOST, DB_USER, DB_PASSWORD, DB_NAME);
@@ -10,4 +10,4 @@
 // Create tables if needed.
 if (!defined('IN_TEST') || IN_TEST == false) {
     prep_DB_content();
-}
\ No newline at end of file
+}
diff --git a/99 - Miscellaneous/Refactoring/includes/footer.php b/99 - Miscellaneous/Refactoring/includes/footer.php
index 49e7385e..e23b5cea 100644
--- a/99 - Miscellaneous/Refactoring/includes/footer.php	
+++ b/99 - Miscellaneous/Refactoring/includes/footer.php	
@@ -1,5 +1,5 @@
 <?php
-include(SITE_PATH . "/includes/closeDB.php");
+include SITE_PATH . '/includes/closeDB.php';
 ?>
 <footer>
     <div class="footer-wrapper">
diff --git a/99 - Miscellaneous/Refactoring/includes/header.php b/99 - Miscellaneous/Refactoring/includes/header.php
index a6140417..6d6e9e26 100644
--- a/99 - Miscellaneous/Refactoring/includes/header.php	
+++ b/99 - Miscellaneous/Refactoring/includes/header.php	
@@ -1,4 +1,4 @@
-<?php require_once(SITE_PATH . "/includes/session.php"); ?>
+<?php require_once SITE_PATH . '/includes/session.php'; ?>
 <!DOCTYPE html>
 <html lang="en">
 <head>
diff --git a/99 - Miscellaneous/Refactoring/includes/session.php b/99 - Miscellaneous/Refactoring/includes/session.php
index 48f212ea..f5d3501d 100644
--- a/99 - Miscellaneous/Refactoring/includes/session.php	
+++ b/99 - Miscellaneous/Refactoring/includes/session.php	
@@ -1,7 +1,7 @@
 <?php
 session_start();
-require_once(SITE_PATH . "/includes/connectDB.php");
-require_once(SITE_PATH . "/includes/classes/Session.php");
+require_once SITE_PATH . '/includes/connectDB.php';
+require_once SITE_PATH . '/includes/classes/Session.php';
 
 /* Setup new session */
 $sessionType = 'Session';
@@ -10,7 +10,7 @@
 /**
  * Is the current user logged on?
  *
- * @param $session Session The session to check.
+ * @param Session $session The session to check.
  * @return bool True if the user is logged on, false otherwise.
  */
 function logged_on($session)
@@ -21,7 +21,7 @@ function logged_on($session)
 /**
  * Ensure the current user is an administrator.
  *
- * @param $session Session The session to check.
+ * @param Session $session The session to check.
  */
 function confirm_is_admin($session)
 {
@@ -39,7 +39,7 @@ function confirm_is_admin($session)
 /**
  * Is the current user an administrator?
  *
- * @param $session Session The session to check.
+ * @param Session $session The session to check.
  * @return bool True if the user is administrator, false if otherwise.
  */
 function is_admin($session)
@@ -51,4 +51,4 @@ function is_admin($session)
     $statement->execute();
     $statement->store_result();
     return $statement->num_rows == 1;
-}
\ No newline at end of file
+}
diff --git a/99 - Miscellaneous/Refactoring/index.php b/99 - Miscellaneous/Refactoring/index.php
index 151ab904..8d18a2e9 100644
--- a/99 - Miscellaneous/Refactoring/index.php	
+++ b/99 - Miscellaneous/Refactoring/index.php	
@@ -1,7 +1,7 @@
 <?php
-require_once("config.php");
-require_once(SITE_PATH . "/includes/connectDB.php");
-include(SITE_PATH . "/includes/header.php");
+require_once 'config.php';
+require_once SITE_PATH . '/includes/connectDB.php';
+include SITE_PATH . '/includes/header.php';
 ?>
 
     <div id="main">
@@ -30,5 +30,5 @@
     </div>
     </div> <!-- End of outer-wrapper which opens in header.php -->
 <?php
-include(SITE_PATH . "/includes/footer.php");
-?>
\ No newline at end of file
+include SITE_PATH . '/includes/footer.php';
+?>
diff --git a/99 - Miscellaneous/Refactoring/logoff.php b/99 - Miscellaneous/Refactoring/logoff.php
index a56d596d..dd915e13 100644
--- a/99 - Miscellaneous/Refactoring/logoff.php	
+++ b/99 - Miscellaneous/Refactoring/logoff.php	
@@ -6,4 +6,4 @@
 }
 session_destroy();
 header("Location: logon.php");
-exit;
\ No newline at end of file
+exit;
diff --git a/99 - Miscellaneous/Refactoring/logon.php b/99 - Miscellaneous/Refactoring/logon.php
index 55b9f2e8..5789935e 100644
--- a/99 - Miscellaneous/Refactoring/logon.php	
+++ b/99 - Miscellaneous/Refactoring/logon.php	
@@ -1,8 +1,8 @@
 <?php
-require_once("config.php");
-require_once(SITE_PATH . "/includes/session.php");
-require_once(SITE_PATH . "/includes/connectDB.php");
-include(SITE_PATH . "/includes/header.php");
+require_once 'config.php';
+require_once SITE_PATH . '/includes/session.php';
+require_once SITE_PATH . '/includes/connectDB.php';
+include SITE_PATH . '/includes/header.php';
 
 if (isset($_POST['submit'])) {
     $username = $_POST['username'];
@@ -54,4 +54,4 @@
         </form>
     </div>
     </div> <!-- End of outer-wrapper which opens in header.php -->
-<?php include(SITE_PATH . "/includes/footer.php"); ?>
\ No newline at end of file
+<?php include SITE_PATH . '/includes/footer.php'; ?>
diff --git a/99 - Miscellaneous/Refactoring/register.php b/99 - Miscellaneous/Refactoring/register.php
index 92766a26..03b79965 100644
--- a/99 - Miscellaneous/Refactoring/register.php	
+++ b/99 - Miscellaneous/Refactoring/register.php	
@@ -1,7 +1,7 @@
 <?php
-require_once("config.php");
-require_once(SITE_PATH . "/includes/connectDB.php");
-include(SITE_PATH . "/includes/header.php");
+require_once 'config.php';
+require_once SITE_PATH . '/includes/connectDB.php';
+include SITE_PATH . '/includes/header.php';
 
 if (isset($_POST['submit'])) {
     $username = $_POST['username'];
@@ -61,5 +61,5 @@
     </div>
     </div> <!-- End of outer-wrapper which opens in header.php -->
 <?php
-include(SITE_PATH . "/includes/footer.php");
-?>
\ No newline at end of file
+include SITE_PATH . '/includes/footer.php';
+?>
diff --git a/99 - Miscellaneous/Refactoring/selectpagetoedit.php b/99 - Miscellaneous/Refactoring/selectpagetoedit.php
index 317b8471..7a99aff5 100644
--- a/99 - Miscellaneous/Refactoring/selectpagetoedit.php	
+++ b/99 - Miscellaneous/Refactoring/selectpagetoedit.php	
@@ -1,7 +1,7 @@
 <?php
-require_once("config.php");
-require_once(SITE_PATH . "/includes/connectDB.php");
-include(SITE_PATH . "/includes/header.php");
+require_once 'config.php';
+require_once SITE_PATH . '/includes/connectDB.php';
+include SITE_PATH . '/includes/header.php';
 confirm_is_admin($session);
 
 if (isset($_POST['submit'])) {
@@ -59,4 +59,4 @@
         <a href="index.php">Cancel</a>
     </div>
     </div> <!-- End of outer-wrapper which opens in header.php -->
-<?php include(SITE_PATH . "/includes/footer.php"); ?>
\ No newline at end of file
+<?php include SITE_PATH . '/includes/footer.php'; ?>
diff --git a/99 - Miscellaneous/Refactoring/styles/site.css b/99 - Miscellaneous/Refactoring/styles/site.css
index c5636eec..414e7429 100644
--- a/99 - Miscellaneous/Refactoring/styles/site.css	
+++ b/99 - Miscellaneous/Refactoring/styles/site.css	
@@ -1,4 +1,4 @@
-html {
+html {
     height: 100%;
     margin: 0;
     padding: 0;