From: Roland Häder <roland@mxchange.org>
Date: Sun, 12 Dec 2021 07:05:34 +0000 (+0100)
Subject: Continued:
X-Git-Url: https://git.mxchange.org/?p=core.git;a=commitdiff_plain;h=08a0c865dd2c8ee0b6dbf96f4f07e9ee0ce0f02b

Continued:
- removed more // END - <something> occurances as I don't do them anymore

Signed-off-by: Roland Häder <roland@mxchange.org>
---

diff --git a/application/tests/exceptions.php b/application/tests/exceptions.php
index a336bb98..bdcf2cb5 100644
--- a/application/tests/exceptions.php
+++ b/application/tests/exceptions.php
@@ -42,7 +42,7 @@ function tests_exception_handler ($exceptionInstance) {
 			// Convert arguments type into human-readable
 			foreach ($traceArray['args'] as $arg) {
 				$argsString .= ', ' . gettype($arg);
-			} // END - foreach
+			}
 			$argsString = substr($argsString, 2);
 
 			// Set missing file/line
@@ -64,7 +64,7 @@ Line   : %d\n",
 				basename($traceArray['file']),
 				$traceArray['line']
 			);
-		} // END - foreach
+		}
 
 		// Construct the message
 		$message = sprintf("--------------------------------------------------------------------------------
@@ -121,7 +121,7 @@ function tests_assert_handler (string $file, int $line, $code) {
 	// Empty code?
 	if ($code === '') {
 		$code = '<em>Unknown</em>';
-	} // END - if
+	}
 
 	// Create message
 	$message = sprintf('File: %s, Line: %s, Code: %s',
diff --git a/contrib/chash/chash.php b/contrib/chash/chash.php
index 4dfc6075..4911ba57 100644
--- a/contrib/chash/chash.php
+++ b/contrib/chash/chash.php
@@ -169,7 +169,7 @@ while (true) {
 				// Reset timer
 				$timeDisplay = microtime(true);
 				$GLOBALS['iteration_second']  = 0;
-			} // END - if
+			}
 
 			// Time spend from last flush
 			$testTime = abs(microtime(true) - $GLOBALS['time_flush']);
@@ -178,7 +178,7 @@ while (true) {
 			if ($testTime >= $GLOBALS['flush_file_time']) {
 				// Flush check-point file
 				flushCheckPointFile($GLOBALS['current_hash']);
-			} // END - if
+			}
 
 			// Time spend from last found block
 			$testTime = abs(microtime(true) - $GLOBALS['found_time']);
@@ -200,7 +200,7 @@ while (true) {
 						if (!isset($hash['root_hash'])) {
 							// Bad file
 							die('INCONSISTENCY: hash=' . print_r($hash, true));
-						} // END - if
+						}
 
 						if (isset($rootHashes[$hash['root_hash']])) {
 							// Count up
@@ -209,23 +209,21 @@ while (true) {
 							// First entry found
 							$rootHashes[$hash['root_hash']] = 1;
 						}
-					} // END - foreach
-				} // END - foreach
+					}
+				}
 
 				// Find best root hash
 				$bestRootHash = '';
 				$bestRootCount = 0;
 				foreach ($rootHashes as $hash => $count) {
-					// Debug message
-					//* NOISY-DEBUG: */ print ('hash=' . $hash . ',count=' . $count . ',bestRootHash=' . $bestRootHash . ',bestRootCount=' . $bestRootCount . PHP_EOL);
-
 					// Is a better one found?
+					//* NOISY-DEBUG: */ print ('hash=' . $hash . ',count=' . $count . ',bestRootHash=' . $bestRootHash . ',bestRootCount=' . $bestRootCount . PHP_EOL);
 					if ($count > $bestRootCount) {
 						// Remember it
 						$bestRootHash  = $hash;
 						$bestRootCount = $count;
-					} // END - if
-				} // END - foreach
+					}
+				}
 
 				// Output message
 				print ('bestRootHash=' . $bestRootHash . ',bestRootCount=' . $bestRootCount . PHP_EOL);
@@ -249,10 +247,10 @@ while (true) {
 
 							// Abort search
 							break;
-						} // END - if
-					} // END - for
-				} // END - foreach
-			} // END - if
+						}
+					}
+				}
+			}
 
 			// Next round
 			$GLOBALS['iteration']++;
@@ -261,27 +259,25 @@ while (true) {
 			//* NOISY-DEBUG: */ print('nonceHash=' . $nonceHash . PHP_EOL);
 			//* NOISY-DEBUG: */ print('sumNonce=' . $sumNonce . PHP_EOL);
 			//* NOISY-DEBUG: */ print('sumGenesis=' . $GLOBALS['sum_genesis'] . PHP_EOL);
-		} // END - while
+		}
 
 		// If the iteration is zero, then no hash is found
 		if ($GLOBALS['iteration'] == 0) {
 			// Bad hash found
 			$timeBadHashes += abs(microtime(true) - $timeHash);
 
-			// And next round
-			//* NOISY-DEBUG: */ print('BAD:nonce=' . $GLOBALS['nonce'] . PHP_EOL);
-
 			// Nothing found, so calculate new nonce
+			//* NOISY-DEBUG: */ print('BAD:nonce=' . $GLOBALS['nonce'] . PHP_EOL);
 			calculateNonce();
 			continue;
-		} // END - if
+		}
 
 		// Add amount of hashes per block (multiple-hash)
 		$GLOBALS['hashes_block'] += $GLOBALS['iteration'] * $GLOBALS['hash_cycles'] + $GLOBALS['hash_cycles'];
 
 		// Push found hash
 		addFoundHash($nonceHash);
-	} // END - while
+	}
 
 	// Flush check-point file
 	flushCheckPointFile($GLOBALS['current_hash']);
@@ -317,4 +313,4 @@ while (true) {
 	$rewardPerHour = $GLOBALS['total_reward'] / abs(microtime(true) - START_TIME) * 3600;
 
 	print ('totalReward=' . $GLOBALS['total_reward'] . ',blockValue=' . $blockValue . ',rewardPerHour=' . $rewardPerHour . PHP_EOL);
-} // END - while
+}
diff --git a/contrib/chash/lib/functions.php b/contrib/chash/lib/functions.php
index 666d4000..fe05fd38 100644
--- a/contrib/chash/lib/functions.php
+++ b/contrib/chash/lib/functions.php
@@ -29,7 +29,7 @@ function multipleHashString ($str) {
 	for ($idx = 0; $idx < ($GLOBALS['hash_cycles'] - 1); $idx++) {
 		// Over-hash the given hash
 		$hash = hashString($hash);
-	} // END - for
+	}
 
 	// Return it
 	return $hash;
@@ -55,7 +55,7 @@ function calculateSumFromHash ($hash) {
 	for ($idx = 0; $idx < (strlen($decode) / 2); $idx++) {
 		// And add it
 		$sum = $sum + hexdec(substr($decode, $idx, 2));
-	} // END - for
+	}
 
 	// And return it
 	//* NOISY-DEBUG: */ printf('[%s:%d]: sum=%d - EXIT!' . PHP_EOL, __FUNCTION__, __LINE__, $sum);
@@ -207,5 +207,5 @@ function loadCheckpointFile () {
 		$GLOBALS['current_hash']   = $data[9];
 		$GLOBALS['root_hash']      = $data[10];
 		$GLOBALS['found_hashes']   = json_decode(gzuncompress(base64_decode($data[11])), TRUE);
-	} // END - if
+	}
 }
diff --git a/contrib/exp/exp1.php b/contrib/exp/exp1.php
index c750e12c..48089352 100644
--- a/contrib/exp/exp1.php
+++ b/contrib/exp/exp1.php
@@ -12,7 +12,7 @@ $x = 1; $y = 0;
 for ($i = 1; $i <= $totalDays; $i++) {
 	$x = bcmul($x, 2);
 	$y = bcadd($y, $x);
-} // END - foreach
+}
 
 print 'After ' . $totalDays . ' days (' . $years . ' years) you have eaten ' . $y . ' fruits.' . PHP_EOL;
 print 'Length:' . strlen($y) . PHP_EOL;
diff --git a/contrib/exp/exp2.php b/contrib/exp/exp2.php
index d83a33c6..c51211e0 100644
--- a/contrib/exp/exp2.php
+++ b/contrib/exp/exp2.php
@@ -22,7 +22,7 @@ for ($i = 1; $i <= $totalMonths; $i++) {
 	$balance = bcadd($balance, $interest);
 
 	print 'Month ' . $i . ': rate=' . bcmul($rate, 100) . '%,interest=' . $interest . ',balance=' . $balance . PHP_EOL;
-} // END - foreach
+}
 
 print 'After ' . $totalMonths . ' months (' . $years . ' years) you have ' . $balance . ' EUR back.' . PHP_EOL;
 //print 'Length:' . strlen($balance) . PHP_EOL;
diff --git a/contrib/lfdb2/read.php b/contrib/lfdb2/read.php
index da41e102..b68b879b 100644
--- a/contrib/lfdb2/read.php
+++ b/contrib/lfdb2/read.php
@@ -19,7 +19,7 @@ if (PHP_INT_SIZE === 8) {
 	$__factor = constant('__FACTOR_64');
 	$__format = constant('__FORMAT_READ_64');
 	$__step   = constant('__STEP_64');
-} // END - if
+}
 
 $buffer = file_get_contents('test.data.bin' . ($__factor * 2)) or die('Please run write.php first!' . PHP_EOL);
 
@@ -58,8 +58,8 @@ for ($pos = 0; $pos < strlen($buffer); $pos += 8) {
 
 		//print 'chr=' . $chr . PHP_EOL;
 		$decoded .= chr($chr);
-	} // END - for
-} // END - for
+	}
+}
 
 $decoded = gzuncompress($decoded);
 
diff --git a/contrib/lfdb2/write.php b/contrib/lfdb2/write.php
index 2b25a6a6..9d1445c5 100644
--- a/contrib/lfdb2/write.php
+++ b/contrib/lfdb2/write.php
@@ -27,7 +27,7 @@ if (PHP_INT_SIZE === 8) {
 	$__right  = constant('__RIGHT_64');
 	$__format = constant('__FORMAT_WRITE_64');
 	$__step   = constant('__STEP_64');
-} // END - if
+}
 
 $str = gzcompress(file_get_contents('test.data'), 9);
 
@@ -46,8 +46,8 @@ for ($idx = 0; $idx < strlen($str); $idx += $__step) {
 			$big += $add;
 
 			//print 'idx=' . $idx . ',i=' . $i . ',ord=' . $ord . ',factor=' . $factor . ',add=' . $add . ',big=' . $big . PHP_EOL;
-		} // END - if
-	} // END - for
+		}
+	}
 
 	$l = ($big & $__left) >>$__factor;
 	$r = $big & $__right;
@@ -56,7 +56,7 @@ for ($idx = 0; $idx < strlen($str); $idx += $__step) {
 	//print 'big=' . $big . ',unpacked('.strlen($unpacked) . ')='.md5($unpacked).PHP_EOL;
 
 	$encoded .= $unpacked;
-} // END - for
+}
 
 print 'Hash(' . strlen($encoded) . ')=' . md5($encoded) . PHP_EOL;
 print 'Encoded ' . strlen($str) . ' bytes into ' . strlen($encoded) . ' bytes ...' . PHP_EOL;
diff --git a/framework/main/classes/cache/class_MemoryCache.php b/framework/main/classes/cache/class_MemoryCache.php
index ee26ab36..6dae7c1b 100644
--- a/framework/main/classes/cache/class_MemoryCache.php
+++ b/framework/main/classes/cache/class_MemoryCache.php
@@ -97,7 +97,7 @@ class MemoryCache extends BaseFrameworkSystem implements Cacheable {
 				// Not found
 				$exists = false;
 			}
-		} // END - if
+		}
 
 		// Return status
 		return $exists;
@@ -128,7 +128,7 @@ class MemoryCache extends BaseFrameworkSystem implements Cacheable {
 		if ($this->offsetExists($offset)) {
 			// Then get the data from it
 			$data = $this->dataCache->offsetGet($offset);
-		} // END - if
+		}
 
 		// Return data
 		return $data;
@@ -146,7 +146,7 @@ class MemoryCache extends BaseFrameworkSystem implements Cacheable {
 			// Purge only existing keys
 			//* DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('CACHE: Unsetting cache ' . $offset);
 			$this->dataCache->offsetUnset($offset);
-		} // END - if
+		}
 	}
 
 }
diff --git a/framework/main/classes/commands/console/class_ConsoleFuseCommand.php b/framework/main/classes/commands/console/class_ConsoleFuseCommand.php
index 7b62c8fd..7d38e84f 100644
--- a/framework/main/classes/commands/console/class_ConsoleFuseCommand.php
+++ b/framework/main/classes/commands/console/class_ConsoleFuseCommand.php
@@ -79,7 +79,7 @@ class ConsoleFuseCommand extends BaseCommand implements Commandable {
 
 			// Abort here
 			return;
-		} // END - if
+		}
 
 		// @TODO Unfinished
 		$this->partialStub('Still unfinished! ;-)');
diff --git a/framework/main/classes/criteria/class_BaseCriteria.php b/framework/main/classes/criteria/class_BaseCriteria.php
index 9331121c..de4cd3ee 100644
--- a/framework/main/classes/criteria/class_BaseCriteria.php
+++ b/framework/main/classes/criteria/class_BaseCriteria.php
@@ -50,7 +50,7 @@ abstract class BaseCriteria extends BaseFrameworkSystem implements Criteria {
 		foreach (array('default', 'choice', 'exclude') as $criteriaType) {
 			// Init it
 			$this->initGenericArrayKey('criteria', $criteriaType, 'entries');
-		} // END - foreach
+		}
 	}
 
 	/**
@@ -169,7 +169,7 @@ abstract class BaseCriteria extends BaseFrameworkSystem implements Criteria {
 		foreach ($this->getGenericArray('criteria') as $criteriaType => $dummy) {
 			// Remove it
 			$this->unsetGenericArrayElement('criteria', $criteriaType, 'entries', $criteriaKey);
-		} // END - foreach
+		}
 	}
 
 	/**
@@ -353,8 +353,8 @@ abstract class BaseCriteria extends BaseFrameworkSystem implements Criteria {
 					// Then count this one up
 					$counted++;
 				}
-			} // END - foreach
-		} // END - foreach
+			}
+		}
 
 		// Now check if expected criteria counts match
 		$matches = ($counted == $this->countGenericArrayGroup('criteria', $criteriaType));
@@ -421,7 +421,7 @@ abstract class BaseCriteria extends BaseFrameworkSystem implements Criteria {
 					urlencode($criteriaValue)
 				);
 			}
-		} // END - foreach
+		}
 
 		// Remove last semicolon
 		$cacheKey = substr($cacheKey, 0, -1);
diff --git a/framework/main/classes/criteria/dataset/class_DataSetCriteria.php b/framework/main/classes/criteria/dataset/class_DataSetCriteria.php
index 5413cfea..7341889e 100644
--- a/framework/main/classes/criteria/dataset/class_DataSetCriteria.php
+++ b/framework/main/classes/criteria/dataset/class_DataSetCriteria.php
@@ -209,7 +209,7 @@ class DataSetCriteria extends BaseCriteria implements StoreableCriteria {
 			foreach ($primaryKeys as $primaryKey) {
 				// Add it
 				$return .= trim($this->getCriteriaElemnent($primaryKey));
-			} // END - foreach
+			}
 
 			// Debug message
 			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('DATA-SET-CRITERIA: tableName=' . $this->getTableName() . ',return=' . $return . ' - EXIT!');
diff --git a/framework/main/classes/criteria/search/class_SearchCriteria.php b/framework/main/classes/criteria/search/class_SearchCriteria.php
index 1cac25ba..fd1e8044 100644
--- a/framework/main/classes/criteria/search/class_SearchCriteria.php
+++ b/framework/main/classes/criteria/search/class_SearchCriteria.php
@@ -202,7 +202,7 @@ class SearchCriteria extends BaseCriteria implements LocalSearchCriteria {
 
 				// Debug message
 				//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('SEARCH-CRITERIA: match=' . $match . ',isMatching=' . intval($isMatching));
-			} // END - foreach
+			}
 
 			// Debug message
 			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('SEARCH-CRITERIA: getCriteriaChoiceElement(' . $key . ')[]=' . gettype($searchChoice) . ',value[]=' . count($valueArray) . ',idx=' . $idx . ',isMatching=' . intval($isMatching) . ' - CHOICE-MATCH');
diff --git a/framework/main/classes/crypto/class_CryptoHelper.php b/framework/main/classes/crypto/class_CryptoHelper.php
index 133cc135..0455b2a1 100644
--- a/framework/main/classes/crypto/class_CryptoHelper.php
+++ b/framework/main/classes/crypto/class_CryptoHelper.php
@@ -95,7 +95,7 @@ class CryptoHelper extends BaseFrameworkSystem implements Cryptable {
 		if (is_null(self::$selfInstance)) {
 			// Then get a new one
 			self::$selfInstance = self::createCryptoHelper();
-		} // END - if
+		}
 
 		// Return the instance
 		return self::$selfInstance;
@@ -184,7 +184,7 @@ class CryptoHelper extends BaseFrameworkSystem implements Cryptable {
 		if (FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('extension_uuid_loaded') === true) {
 			// Then add it as well
 			$uuid = uuid_create();
-		} // END - if
+		}
 
 		// Return it
 		return $uuid;
@@ -212,7 +212,7 @@ class CryptoHelper extends BaseFrameworkSystem implements Cryptable {
 
 			// Then extract the X first characters from the hash as our salt
 			$salt = substr($oldHash, 0, $length);
-		} // END - if
+		}
 
 		// Hash the password with salt
 		//* DEBUG: */ echo "salt=".$salt."/plain=".$str."<br />\n";
diff --git a/framework/main/classes/database/frontend/class_BaseDatabaseFrontend.php b/framework/main/classes/database/frontend/class_BaseDatabaseFrontend.php
index f85f4bad..455213ec 100644
--- a/framework/main/classes/database/frontend/class_BaseDatabaseFrontend.php
+++ b/framework/main/classes/database/frontend/class_BaseDatabaseFrontend.php
@@ -67,7 +67,7 @@ abstract class BaseDatabaseFrontend extends BaseFrameworkSystem {
 		if (FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('database_cache_enabled') === true) {
 			// Set the new instance
 			$this->setCacheInstance(ObjectFactory::createObjectByConfiguredName('cache_class'));
-		} // END - if
+		}
 	}
 
 	/**
@@ -126,7 +126,7 @@ abstract class BaseDatabaseFrontend extends BaseFrameworkSystem {
 			// First get a key suitable for our cache and extend it with this class name
 			$cacheKey = $this->getCacheKeyByCriteria($dataSetInstance, $onlyKeys);
 			//* DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-FRONTEND: Using cache key ' . $cacheKey . ' for purging ...');
-		} // END - if
+		}
 
 		// Does this key exists in cache?
 		//* DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-FRONTEND: cacheKey[%s]=%s', gettype($cacheKey), $cacheKey));
@@ -134,7 +134,7 @@ abstract class BaseDatabaseFrontend extends BaseFrameworkSystem {
 			// Purge the cache
 			//* DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-FRONTEND: Calling this->cacheInstance->purgeOffset(%s) ...', $cacheKey));
 			$this->getCacheInstance()->purgeOffset($cacheKey);
-		} // END - if
+		}
 
 		// Handle it over to the middleware
 		FrameworkBootstrap::getDatabaseInstance()->queryInsertDataSet($dataSetInstance);
@@ -159,13 +159,13 @@ abstract class BaseDatabaseFrontend extends BaseFrameworkSystem {
 			// First get a key suitable for our cache and extend it with this class name
 			$cacheKey = $this->getCacheKeyByCriteria($dataSetInstance, $onlyKeys);
 			//* DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-FRONTEND: Using cache key ' . $cacheKey . ' for purging ...');
-		} // END - if
+		}
 
 		// Does this key exists in cache?
 		if ((FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('database_cache_enabled') === true) && ($this->getCacheInstance()->offsetExists($cacheKey))) {
 			// Purge the cache
 			$this->getCacheInstance()->purgeOffset($cacheKey);
-		} // END - if
+		}
 
 		// Handle it over to the middleware
 		FrameworkBootstrap::getDatabaseInstance()->queryUpdateDataSet($dataSetInstance);
@@ -207,7 +207,7 @@ abstract class BaseDatabaseFrontend extends BaseFrameworkSystem {
 		if (FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('database_cache_enabled') === true) {
 			// First get a key suitable for our cache and extend it with this class name
 			$cacheKey = $this->getCacheKeyByCriteria($criteriaInstance, $onlyKeys);
-		} // END - if
+		}
 
 		// Does this key exists in cache?
 		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-FRONTEND: cacheKey[%s]=%s', gettype($cacheKey), $cacheKey));
@@ -228,7 +228,7 @@ abstract class BaseDatabaseFrontend extends BaseFrameworkSystem {
 					// A valid result has returned from the database layer
 					//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-FRONTEND: Setting cacheKey=%s with result()=%d entries', $cacheKey, count($result)));
 					$this->getCacheInstance()->offsetSet($cacheKey, $result);
-				} // END - if
+				}
 			} else {
 				// This invalid result must be wrapped
 				$result = array(
@@ -269,7 +269,7 @@ abstract class BaseDatabaseFrontend extends BaseFrameworkSystem {
 
 			// Debug message
 			//* DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-FRONTEND: numRows=' . $numRows);
-		} // END - if
+		}
 
 		// Return the result
 		return $numRows;
diff --git a/framework/main/classes/database/frontend/user/class_UserDatabaseFrontend.php b/framework/main/classes/database/frontend/user/class_UserDatabaseFrontend.php
index 9b303a73..e49d7723 100644
--- a/framework/main/classes/database/frontend/user/class_UserDatabaseFrontend.php
+++ b/framework/main/classes/database/frontend/user/class_UserDatabaseFrontend.php
@@ -114,7 +114,7 @@ class UserDatabaseFrontend extends BaseDatabaseFrontend implements ManageableAcc
 			if (is_null($updateInstance)) {
 				// Throw an exception here
 				throw new NullPointerException($this, self::EXCEPTION_IS_NULL_POINTER);
-			} // END - if
+			}
 
 			// Get search instance from update instance
 			$searchInstance = $updateInstance->getSearchInstance();
@@ -123,8 +123,8 @@ class UserDatabaseFrontend extends BaseDatabaseFrontend implements ManageableAcc
 			if (is_null($searchInstance)) {
 				// Throw an exception here
 				throw new NullPointerException($updateInstance, self::EXCEPTION_IS_NULL_POINTER);
-			} // END - if
-		} // END - if
+			}
+		}
 
 		// Generate a data set object
 		$dataSetInstance = ObjectFactory::createObjectByConfiguredName('dataset_criteria_class', array(self::DB_TABLE_USER));
diff --git a/framework/main/classes/feature/class_FrameworkFeature.php b/framework/main/classes/feature/class_FrameworkFeature.php
index 5bfb48f5..0f67a15b 100644
--- a/framework/main/classes/feature/class_FrameworkFeature.php
+++ b/framework/main/classes/feature/class_FrameworkFeature.php
@@ -82,7 +82,7 @@ class FrameworkFeature extends BaseFrameworkSystem {
 
 			// Check configuration
 			self::$enabledFeatures[$featureName]['is_enabled'] = (FrameworkBootstrap::getConfigurationInstance()->getConfigEntry($configKey) === 'Y');
-		} // END - if
+		}
 
 		// Return "cached" status
 		return self::$enabledFeatures[$featureName]['is_enabled'];
@@ -111,7 +111,7 @@ class FrameworkFeature extends BaseFrameworkSystem {
 				// Then it can't be available
 				self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('FRAMEWORK-FEATURE: Feature "%s"is not enabled.', $featureName));
 				return false;
-			} // END - if
+			}
 
 			// Create config key (for feature class lookup)
 			$configKey = sprintf('feature_%s_class', $featureName);
@@ -128,7 +128,7 @@ class FrameworkFeature extends BaseFrameworkSystem {
 				// Feature class not found
 				self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('FRAMEWORK-FEATURE: Feature "%s"is not available due to missing feature class. Disabling feature ...', $featureName));
 			}
-		} // END - if
+		}
 
 		// Return "cached" status
 		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('FRAMEWORK-FEATURE: featureName=%s,isAvailable=%d - EXIT!', $featureName, intval(self::$enabledFeatures[$featureName]['is_available'])));
@@ -164,7 +164,7 @@ class FrameworkFeature extends BaseFrameworkSystem {
 		if (!is_callable($callable)) {
 			// Not callable method requested
 			throw new FeatureMethodNotCallableException(array(self::$enabledFeatures[$featureName]['instance'], $featureMethod), self::EXCEPTION_FEATURE_METHOD_NOT_CALLABLE);
-		} // END - if
+		}
 
 		// Then call it
 		$return = call_user_func_array($callable, $args);
diff --git a/framework/main/classes/file_directories/directory/class_FrameworkDirectoryPointer.php b/framework/main/classes/file_directories/directory/class_FrameworkDirectoryPointer.php
index 7eb73dfa..d6c195b4 100644
--- a/framework/main/classes/file_directories/directory/class_FrameworkDirectoryPointer.php
+++ b/framework/main/classes/file_directories/directory/class_FrameworkDirectoryPointer.php
@@ -63,7 +63,7 @@ class FrameworkDirectoryPointer extends BaseFrameworkSystem implements Framework
 		if ($this->getDirectoryIteratorInstance() instanceof DirectoryIterator) {
 			// Try to close a directory
 			$this->closeDirectory();
-		} // END - if
+		}
 
 		// Call the parent destructor
 		parent::__destruct();
@@ -170,8 +170,8 @@ class FrameworkDirectoryPointer extends BaseFrameworkSystem implements Framework
 				// To next entry
 				//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('DIRECTORY-POINTER: Invoking directoryIteratorInstance->next() ...');
 				$this->getDirectoryIteratorInstance()->next();
-			} // END - while
-		} // END - if
+			}
+		}
 
 		// Return read line
 		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('DIRECTORY-POINTER: fileInfoInstance[%s]=%s - EXIT!', gettype($fileInfoInstance), $fileInfoInstance));
diff --git a/framework/main/classes/file_directories/input/raw/class_FrameworkRawFileInputPointer.php b/framework/main/classes/file_directories/input/raw/class_FrameworkRawFileInputPointer.php
index e679aadf..61fc5f12 100644
--- a/framework/main/classes/file_directories/input/raw/class_FrameworkRawFileInputPointer.php
+++ b/framework/main/classes/file_directories/input/raw/class_FrameworkRawFileInputPointer.php
@@ -76,7 +76,7 @@ class FrameworkRawFileInputPointer extends BaseFileIo implements InputPointer {
 		if ((is_null($fileObject)) || ($fileObject === false)) {
 			// Something bad happend
 			throw new FileIoException($infoInstance, self::EXCEPTION_FILE_POINTER_INVALID);
-		} // END - if
+		}
 
 		// Create new instance
 		$pointerInstance = new FrameworkRawFileInputPointer();
diff --git a/framework/main/classes/file_directories/input/text/class_FrameworkTextFileInputPointer.php b/framework/main/classes/file_directories/input/text/class_FrameworkTextFileInputPointer.php
index 46eb3761..27565cef 100644
--- a/framework/main/classes/file_directories/input/text/class_FrameworkTextFileInputPointer.php
+++ b/framework/main/classes/file_directories/input/text/class_FrameworkTextFileInputPointer.php
@@ -80,7 +80,7 @@ class FrameworkTextFileInputPointer extends BaseFileIo implements InputPointer {
 		if ((is_null($fileObject)) || ($fileObject === false)) {
 			// Something bad happend
 			throw new FileIoException($infoInstance, self::EXCEPTION_FILE_POINTER_INVALID);
-		} // END - if
+		}
 
 		// Create new instance
 		$pointerInstance = new FrameworkTextFileInputPointer();
diff --git a/framework/main/classes/file_directories/io_stream/class_FileIoStream.php b/framework/main/classes/file_directories/io_stream/class_FileIoStream.php
index 6c793b84..551791f3 100644
--- a/framework/main/classes/file_directories/io_stream/class_FileIoStream.php
+++ b/framework/main/classes/file_directories/io_stream/class_FileIoStream.php
@@ -101,7 +101,7 @@ class FileIoStream extends BaseFrameworkSystem implements FileInputStreamer, Fil
 				// Bail out
 				ApplicationEntryPoint::exitApplication('The application has made a fatal error. Exception: ' . $e->__toString() . ' with message: ' . $e->getMessage());
 			}
-		} // END - for
+		}
 
 		// Write a header information for validation purposes
 		$fileInstance->writeToFile(sprintf('%s%s%s%s%s%s%s%s%s' . PHP_EOL,
@@ -136,7 +136,7 @@ class FileIoStream extends BaseFrameworkSystem implements FileInputStreamer, Fil
 
 			// Advance to the next 50-chars block
 			$idx += 50;
-		} // END - while
+		}
 
 		// Close the file
 		unset($fileInstance);
@@ -168,11 +168,11 @@ class FileIoStream extends BaseFrameworkSystem implements FileInputStreamer, Fil
 			// Break infinite loop maybe caused by the input handler
 			if ($lastBuffer == $inputBuffer) {
 				break;
-			} // END - if
+			}
 
 			// Remember last read line for avoiding possible infinite loops
 			$lastBuffer = $inputBuffer;
-		} // END - while
+		}
 
 		// Close directory handle
 		unset($fileInstance);
@@ -198,7 +198,7 @@ class FileIoStream extends BaseFrameworkSystem implements FileInputStreamer, Fil
 				if (count($header) != 4) {
 					// Throw an exception
 					throw new InvalidArrayCountException(array($this, 'header', count($header), 4), self::EXCEPTION_ARRAY_HAS_INVALID_COUNT);
-				} // END - if
+				}
 			} elseif (substr($rawLine, 0, 5) == self::FILE_IO_DATA_BLOCK_ID) {
 				// Is a data line!
 				$data = explode(self::FILE_IO_SEPARATOR, $rawLine);
@@ -212,7 +212,7 @@ class FileIoStream extends BaseFrameworkSystem implements FileInputStreamer, Fil
 					if (md5($data[0]) != $data[1]) {
 						// MD5 hash did not match!
 						throw new InvalidMD5ChecksumException(array($this, md5($data[0]), $data[1]), self::EXCEPTION_MD5_CHECKSUMS_MISMATCH);
-					} // END - if
+					}
 				} else {
 					// Invalid count!
 					throw new InvalidArrayCountException(array($this, 'data', count($data), 2), self::EXCEPTION_ARRAY_HAS_INVALID_COUNT);
@@ -224,19 +224,19 @@ class FileIoStream extends BaseFrameworkSystem implements FileInputStreamer, Fil
 				// Other raw lines than header/data tagged lines and re-add the new-line char
 				$readData .= $rawLine . PHP_EOL;
 			}
-		} // END - foreach
+		}
 
 		// Was raw lines read and no header/data?
 		if ((!empty($readData)) && (count($header) == 0) && (count($data) == 0)) {
 			// Return raw lines back
 			return $readData;
-		} // END - if
+		}
 
 		// Was a header found?
 		if (count($header) != 4) {
 			// Throw an exception
 			throw new InvalidArrayCountException(array($this, 'header', count($header), 4), self::EXCEPTION_ARRAY_HAS_INVALID_COUNT);
-		} // END - if
+		}
 
 		// Decode all from Base64
 		$readData = @base64_decode($readData);
@@ -245,13 +245,13 @@ class FileIoStream extends BaseFrameworkSystem implements FileInputStreamer, Fil
 		if (strlen($readData) != $header[2]) {
 			// Size did not match
 			throw new InvalidDataLengthException(array($this, strlen($readData), $header[2]), self::EXCEPTION_UNEXPECTED_STRING_SIZE);
-		} // END - if
+		}
 
 		// Validate the decoded data with the final MD5 hash
 		if (md5($readData) != $header[3]) {
 			// MD5 hash did not match!
 			throw new InvalidMD5ChecksumException(array($this, md5($readData), $header[3]), self::EXCEPTION_MD5_CHECKSUMS_MISMATCH);
-		} // END - if
+		}
 
 		// Return all in an array
 		return array(
diff --git a/framework/main/classes/file_directories/output/raw/class_FrameworkRawFileOutputPointer.php b/framework/main/classes/file_directories/output/raw/class_FrameworkRawFileOutputPointer.php
index 7b4e0986..2436b0f4 100644
--- a/framework/main/classes/file_directories/output/raw/class_FrameworkRawFileOutputPointer.php
+++ b/framework/main/classes/file_directories/output/raw/class_FrameworkRawFileOutputPointer.php
@@ -59,14 +59,14 @@ class FrameworkRawFileOutputPointer extends BaseFileIo implements OutputPointer
 		if (is_null($mode)) {
 			// No infoInstance given
 			throw new InvalidArgumentException('Parameter "mode" is empty');
-		} // END - if
+		}
 
 		// Try to open a handler
 		$fileObject = $infoInstance->openFile($mode);
 		if ((is_null($fileObject)) || ($fileObject === false)) {
 			// Something bad happend
 			throw new FileIoException($infoInstance, self::EXCEPTION_FILE_POINTER_INVALID);
-		} // END - if
+		}
 
 		// Create new instance
 		$pointerInstance = new FrameworkRawFileOutputPointer();
diff --git a/framework/main/classes/file_directories/output/text/class_FrameworkTextFileOutputPointer.php b/framework/main/classes/file_directories/output/text/class_FrameworkTextFileOutputPointer.php
index a1bc2cac..33aa707c 100644
--- a/framework/main/classes/file_directories/output/text/class_FrameworkTextFileOutputPointer.php
+++ b/framework/main/classes/file_directories/output/text/class_FrameworkTextFileOutputPointer.php
@@ -60,7 +60,7 @@ class FrameworkTextFileOutputPointer extends BaseFileIo implements OutputPointer
 		if (empty($mode)) {
 			// No filename given
 			throw new InvalidArgumentException('Parameter "mode" is empty');
-		} // END - if
+		}
 
 		// Try to open a handler
 		$fileObject = $fileInstance->openFile($mode);
@@ -69,7 +69,7 @@ class FrameworkTextFileOutputPointer extends BaseFileIo implements OutputPointer
 		if ((is_null($fileObject)) || ($fileObject === false)) {
 			// Something bad happend
 			throw new FileIoException($fileInstance, self::EXCEPTION_FILE_POINTER_INVALID);
-		} // END - if
+		}
 
 		// Create new instance
 		$pointerInstance = new FrameworkTextFileOutputPointer();
diff --git a/framework/main/classes/filter/validator/class_EmailValidatorFilter.php b/framework/main/classes/filter/validator/class_EmailValidatorFilter.php
index 8d1d827c..44da75c3 100644
--- a/framework/main/classes/filter/validator/class_EmailValidatorFilter.php
+++ b/framework/main/classes/filter/validator/class_EmailValidatorFilter.php
@@ -124,7 +124,7 @@ class EmailValidatorFilter extends BaseFilter implements Filterable {
 
 				// Abort here
 				throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
-			} // END - elseif
+			}
 		} elseif (empty($email)) {
 			// Empty field!
 			$requestInstance->requestIsValid(false);
@@ -134,7 +134,7 @@ class EmailValidatorFilter extends BaseFilter implements Filterable {
 
 			// Abort here
 			throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
-		} // END - elseif
+		}
 	}
 
 	/**
@@ -151,19 +151,19 @@ class EmailValidatorFilter extends BaseFilter implements Filterable {
 		$userInstance = NULL;
 
 		// Get a registry instance
-		$registry = GenericRegistry::getRegistry();
+		$registryInstance = GenericRegistry::getRegistry();
 
 		// Is the user already there?
-		if ($registry->instanceExists('user')) {
+		if ($registryInstance->instanceExists('user')) {
 			// Use the instance for checking for the email
-			$userInstance = $registry->getInstance('user');
+			$userInstance = $registryInstance->getInstance('user');
 			$userInstance->setEmailAddress($email);
 		} else {
 			// If this instance is created then the username *does* exist
 			$userInstance = call_user_func_array(array(FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('user_class'), 'createMemberByEmail'), array($email));
 
 			// Remember this user instance in our registry for later usage
-			$registry->addInstance('user', $userInstance);
+			$registryInstance->addInstance('user', $userInstance);
 		}
 
 		// Does the email exist?
diff --git a/framework/main/classes/filter/validator/class_PasswordValidatorFilter.php b/framework/main/classes/filter/validator/class_PasswordValidatorFilter.php
index d910bdf7..87a8ebe6 100644
--- a/framework/main/classes/filter/validator/class_PasswordValidatorFilter.php
+++ b/framework/main/classes/filter/validator/class_PasswordValidatorFilter.php
@@ -106,7 +106,7 @@ class PasswordValidatorFilter extends BaseFilter implements Filterable {
 
 			// Abort here
 			throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
-		} // END - elseif
+		}
 	}
 
 }
diff --git a/framework/main/classes/filter/validator/class_UserNameValidatorFilter.php b/framework/main/classes/filter/validator/class_UserNameValidatorFilter.php
index 97eb61df..e42a4748 100644
--- a/framework/main/classes/filter/validator/class_UserNameValidatorFilter.php
+++ b/framework/main/classes/filter/validator/class_UserNameValidatorFilter.php
@@ -117,12 +117,12 @@ class UserNameValidatorFilter extends BaseFilter implements Filterable {
 		$userInstance = NULL;
 
 		// Get a registry instance
-		$registry = GenericRegistry::getRegistry();
+		$registryInstance = GenericRegistry::getRegistry();
 
 		// Is the user already there?
-		if ($registry->instanceExists('user')) {
+		if ($registryInstance->instanceExists('user')) {
 			// Use the instance for checking for the email
-			$userInstance = $registry->getInstance('user');
+			$userInstance = $registryInstance->getInstance('user');
 			$userInstance->setUserName($userName);
 		} else {
 			// If this instance is created then the username *does* exist
@@ -131,7 +131,7 @@ class UserNameValidatorFilter extends BaseFilter implements Filterable {
 				$userInstance = call_user_func_array(array(FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('user_class'), 'createMemberByUsername'), array($userName));
 
 				// Remember this user instance in our registry for later usage
-				$registry->addInstance('user', $userInstance);
+				$registryInstance->addInstance('user', $userInstance);
 			} catch (UsernameMissingException $e) {
 				// User was not found
 			}
diff --git a/framework/main/classes/filter/verifier/class_AccountPasswordVerifierFilter.php b/framework/main/classes/filter/verifier/class_AccountPasswordVerifierFilter.php
index d0a5da97..1fd67958 100644
--- a/framework/main/classes/filter/verifier/class_AccountPasswordVerifierFilter.php
+++ b/framework/main/classes/filter/verifier/class_AccountPasswordVerifierFilter.php
@@ -88,8 +88,8 @@ class AccountPasswordVerifierFilter extends BaseFilter implements Filterable {
 
 				// Abort here
 				throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
-			} // END - if
-		} // END - if
+			}
+		}
 
 		if (empty($password)) {
 			// Password is empty
@@ -100,7 +100,7 @@ class AccountPasswordVerifierFilter extends BaseFilter implements Filterable {
 
 			// Abort here
 			throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
-		} // END - if
+		}
 
 		// Get a user instance
 		$userInstance = GenericRegistry::getRegistry()->getInstance('user');
@@ -115,7 +115,7 @@ class AccountPasswordVerifierFilter extends BaseFilter implements Filterable {
 		if ($currentHash != $passHash) {
 			// Throw an exception here to stop the proccessing
 			throw new AccountPasswordMismatchException($this, BaseUser::EXCEPTION_USER_PASS_MISMATCH);
-		} // END - if
+		}
 	}
 
 }
diff --git a/framework/main/classes/filter/verifier/class_BirthdayVerifierFilter.php b/framework/main/classes/filter/verifier/class_BirthdayVerifierFilter.php
index 80bab34a..e7c44c41 100644
--- a/framework/main/classes/filter/verifier/class_BirthdayVerifierFilter.php
+++ b/framework/main/classes/filter/verifier/class_BirthdayVerifierFilter.php
@@ -70,7 +70,7 @@ class BirthdayVerifierFilter extends BaseFilter implements Filterable {
 
 			// Add a message to the response
 			$responseInstance->addFatalMessage('day_of_birth_unset');
-		} // END - if
+		}
 
 		// Month of birth set?
 		if (!$requestInstance->isRequestElementSet('birth_month')) {
@@ -79,7 +79,7 @@ class BirthdayVerifierFilter extends BaseFilter implements Filterable {
 
 			// Add a message to the response
 			$responseInstance->addFatalMessage('month_of_birth_unset');
-		} // END - if
+		}
 
 		// Year of birth set?
 		if (!$requestInstance->isRequestElementSet('birth_year')) {
@@ -88,13 +88,13 @@ class BirthdayVerifierFilter extends BaseFilter implements Filterable {
 
 			// Add a message to the response
 			$responseInstance->addFatalMessage('year_of_birth_unset');
-		} // END - if
+		}
 
 		// Is the request still valid?
 		if (!$requestInstance->isRequestValid()) {
 			// Abort here
 			throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
-		} // END - if
+		}
 
 		// Now comes the final check
 		$birthCheck = mktime(
@@ -116,7 +116,7 @@ class BirthdayVerifierFilter extends BaseFilter implements Filterable {
 
 			// Abort here
 			throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
-		} // END - if
+		}
 	}
 
 }
diff --git a/framework/main/classes/filter/verifier/class_ConfirmCodeVerifierFilter.php b/framework/main/classes/filter/verifier/class_ConfirmCodeVerifierFilter.php
index 7cc1256f..7330ae39 100644
--- a/framework/main/classes/filter/verifier/class_ConfirmCodeVerifierFilter.php
+++ b/framework/main/classes/filter/verifier/class_ConfirmCodeVerifierFilter.php
@@ -106,7 +106,7 @@ class ConfirmCodeVerifierFilter extends BaseFilter implements Filterable {
 
 			// Stop processing here
 			exit();
-		} // END - if
+		}
 	}
 
 }
diff --git a/framework/main/classes/filter/verifier/class_GraphicalCodeCaptchaVerifierFilter.php b/framework/main/classes/filter/verifier/class_GraphicalCodeCaptchaVerifierFilter.php
index 21ee3765..637dedb9 100644
--- a/framework/main/classes/filter/verifier/class_GraphicalCodeCaptchaVerifierFilter.php
+++ b/framework/main/classes/filter/verifier/class_GraphicalCodeCaptchaVerifierFilter.php
@@ -76,7 +76,7 @@ class GraphicalCodeCaptchaVerifierFilter extends BaseFilter implements Filterabl
 
 			// Skip further processing
 			throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
-		} // END - if
+		}
 
 		// Create config entry
 		$configKey = sprintf('%s_captcha_secured',
@@ -87,7 +87,7 @@ class GraphicalCodeCaptchaVerifierFilter extends BaseFilter implements Filterabl
 		if (FrameworkBootstrap::getConfigurationInstance()->getConfigEntry($configKey) != 'Y') {
 			// Not enabled, so don't check
 			return;
-		} // END - if
+		}
 
 		// Get the captcha code
 		$captchaCode = $requestInstance->getRequestElement('c_code');
@@ -153,7 +153,7 @@ class GraphicalCodeCaptchaVerifierFilter extends BaseFilter implements Filterabl
 
 			// Skip further processing
 			throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
-		} // END - not the same!
+		}
 	}
 
 }
diff --git a/framework/main/classes/filter/verifier/class_UserGuestVerifierFilter.php b/framework/main/classes/filter/verifier/class_UserGuestVerifierFilter.php
index 0cd03f94..b273870f 100644
--- a/framework/main/classes/filter/verifier/class_UserGuestVerifierFilter.php
+++ b/framework/main/classes/filter/verifier/class_UserGuestVerifierFilter.php
@@ -119,12 +119,12 @@ class UserGuestVerifierFilter extends BaseFilter implements Filterable {
 		$userInstance = NULL;
 
 		// Get a registry instance
-		$registry = GenericRegistry::getRegistry();
+		$registryInstance = GenericRegistry::getRegistry();
 
 		// Is the user already there?
-		if ($registry->instanceExists('user')) {
+		if ($registryInstance->instanceExists('user')) {
 			// Use the instance for checking for the email
-			$userInstance = $registry->getInstance('user');
+			$userInstance = $registryInstance->getInstance('user');
 			$userInstance->setUserGuest($userName);
 		} else {
 			// If this instance is created then the username *does* exist
@@ -133,7 +133,7 @@ class UserGuestVerifierFilter extends BaseFilter implements Filterable {
 				$userInstance = call_user_func_array(array(FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('guest_class'), 'createGuestByUsername'), array($userName));
 
 				// Remember this user instance in our registry for later usage
-				$registry->addInstance('user', $userInstance);
+				$registryInstance->addInstance('user', $userInstance);
 			} catch (UsernameMissingException $e) {
 				// User was not found
 			}
diff --git a/framework/main/classes/filter/verifier/class_UserNameVerifierFilter.php b/framework/main/classes/filter/verifier/class_UserNameVerifierFilter.php
index e57bfda2..f55b632d 100644
--- a/framework/main/classes/filter/verifier/class_UserNameVerifierFilter.php
+++ b/framework/main/classes/filter/verifier/class_UserNameVerifierFilter.php
@@ -117,12 +117,12 @@ class UserNameVerifierFilter extends BaseFilter implements Filterable {
 		$userInstance = NULL;
 
 		// Get a registry instance
-		$registry = GenericRegistry::getRegistry();
+		$registryInstance = GenericRegistry::getRegistry();
 
 		// Is the user already there?
-		if ($registry->instanceExists('user')) {
+		if ($registryInstance->instanceExists('user')) {
 			// Use the instance for checking for the email
-			$userInstance = $registry->getInstance('user');
+			$userInstance = $registryInstance->getInstance('user');
 			$userInstance->setUserName($userName);
 		} else {
 			// If this instance is created then the username *does* exist
@@ -131,7 +131,7 @@ class UserNameVerifierFilter extends BaseFilter implements Filterable {
 				$userInstance = call_user_func_array(array(FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('user_class'), 'createMemberByUsername'), array($userName));
 
 				// Remember this user instance in our registry for later usage
-				$registry->addInstance('user', $userInstance);
+				$registryInstance->addInstance('user', $userInstance);
 			} catch (UsernameMissingException $e) {
 				// User was not found
 			}
@@ -141,7 +141,7 @@ class UserNameVerifierFilter extends BaseFilter implements Filterable {
 		if ((is_null($userInstance)) || ($userInstance->ifUsernameExists() === false)) {
 			// This username is still available
 			$alreadyTaken = false;
-		} // END - if
+		}
 
 		// Return the result
 		return $alreadyTaken;
diff --git a/framework/main/classes/filter/verifier/class_UserStatusVerifierFilter.php b/framework/main/classes/filter/verifier/class_UserStatusVerifierFilter.php
index 47dbb780..8c31ee9d 100644
--- a/framework/main/classes/filter/verifier/class_UserStatusVerifierFilter.php
+++ b/framework/main/classes/filter/verifier/class_UserStatusVerifierFilter.php
@@ -77,7 +77,7 @@ class UserStatusVerifierFilter extends BaseFilter implements Filterable {
 
 			// Stop processing here
 			exit();
-		} // END - if
+		}
 	}
 
 }
diff --git a/framework/main/classes/filter/verifier/class_UserUnconfirmedVerifierFilter.php b/framework/main/classes/filter/verifier/class_UserUnconfirmedVerifierFilter.php
index d2524dee..ea98a930 100644
--- a/framework/main/classes/filter/verifier/class_UserUnconfirmedVerifierFilter.php
+++ b/framework/main/classes/filter/verifier/class_UserUnconfirmedVerifierFilter.php
@@ -79,7 +79,7 @@ class UserUnconfirmedVerifierFilter extends BaseFilter implements Filterable {
 
 			// Stop processing here
 			exit();
-		} // END - if
+		}
 
 		// Is the user account confirmed?
 		if ($userInstance->getField(UserDatabaseFrontend::DB_COLUMN_USER_STATUS) != FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('user_status_unconfirmed')) {
@@ -91,7 +91,7 @@ class UserUnconfirmedVerifierFilter extends BaseFilter implements Filterable {
 
 			// Stop processing here
 			exit();
-		} // END - if
+		}
 
 		// Add this instance to registry
 		GenericRegistry::getRegistry()->addInstance('user', $userInstance);
diff --git a/framework/main/classes/fuse/class_FrameworkFuseWrapper.php_discontinued b/framework/main/classes/fuse/class_FrameworkFuseWrapper.php_discontinued
index 3b6582ed..6736a78c 100644
--- a/framework/main/classes/fuse/class_FrameworkFuseWrapper.php_discontinued
+++ b/framework/main/classes/fuse/class_FrameworkFuseWrapper.php_discontinued
@@ -68,7 +68,7 @@ class FrameworkFuseWrapper extends FuseWrapper implements Registerable {
 	public function FsOpen ($path, FuseFileInfo $fi) {
 		if (($fi->flags & FUSE_O_ACCMODE) != FUSE_O_RDONLY) {
 			return -FUSE_ENOACCES;
-		} // END - if
+		}
 
 		return -FUSE_ENOERR;
 	}
@@ -88,7 +88,7 @@ class FrameworkFuseWrapper extends FuseWrapper implements Registerable {
 
 		if ($offset > strlen($data)) {
 			return 0;
-		} // END - if
+		}
 
 		$buf = substr( $data, $offset, $size );
 
@@ -105,7 +105,7 @@ class FrameworkFuseWrapper extends FuseWrapper implements Registerable {
 	public function FsReadDir ($path, array &$buf) {
 		if (strcmp($path, '/') != 0) {
 			return -FUSE_ENOENT;
-		} // END - if
+		}
 
 		$buf[] = '.';
 		$buf[] = '..';
diff --git a/framework/main/classes/helper/html/forms/class_HtmlFormHelper.php b/framework/main/classes/helper/html/forms/class_HtmlFormHelper.php
index 31fa98b0..01793e50 100644
--- a/framework/main/classes/helper/html/forms/class_HtmlFormHelper.php
+++ b/framework/main/classes/helper/html/forms/class_HtmlFormHelper.php
@@ -94,7 +94,7 @@ class HtmlFormHelper extends BaseHtmlHelper implements HelpableTemplate {
 		if (is_null($formId)) {
 			// Use form id from form name
 			$formId = $formName;
-		} // END - if
+		}
 
 		// Set form name
 		$helperInstance->setFormName($formName);
@@ -158,7 +158,7 @@ class HtmlFormHelper extends BaseHtmlHelper implements HelpableTemplate {
 			if ($this->ifGroupOpenedPreviously()) {
 				// Then automatically close it here
 				$this->addFormGroup();
-			} // END - if
+			}
 
 			// Simply close it
 			$this->formOpened = false;
@@ -182,7 +182,7 @@ class HtmlFormHelper extends BaseHtmlHelper implements HelpableTemplate {
 		if (($this->formOpened === false) && ($this->formEnabled === true)) {
 			// Throw an exception
 			throw new FormClosedException (array($this, $fieldName), self::EXCEPTION_CLOSED_FORM);
-		} // END - if
+		}
 
 		// Generate the content
 		$inputContent = sprintf('<input type="text" class="form-control" id="%s_%s_field" name="%s" value="%s" />',
@@ -225,7 +225,7 @@ class HtmlFormHelper extends BaseHtmlHelper implements HelpableTemplate {
 		if (($this->formOpened === false) && ($this->formEnabled === true)) {
 			// Throw an exception
 			throw new FormClosedException (array($this, $fieldName), self::EXCEPTION_CLOSED_FORM);
-		} // END - if
+		}
 
 		// Generate the content
 		$inputContent = sprintf('<input type="password" class="form-control" id="%s_%s_field" name="%s" value="%s" />',
@@ -253,7 +253,7 @@ class HtmlFormHelper extends BaseHtmlHelper implements HelpableTemplate {
 		if (($this->formOpened === false) && ($this->formEnabled === true)) {
 			// Throw an exception
 			throw new FormClosedException (array($this, $fieldName), self::EXCEPTION_CLOSED_FORM);
-		} // END - if
+		}
 
 		// Generate the content
 		$inputContent = sprintf('<input type="hidden" name="%s" value="%s" />',
@@ -310,7 +310,7 @@ class HtmlFormHelper extends BaseHtmlHelper implements HelpableTemplate {
 		if (($this->formOpened === false) && ($this->formEnabled === true)) {
 			// Throw an exception
 			throw new FormClosedException (array($this, $fieldName), self::EXCEPTION_CLOSED_FORM);
-		} // END - if
+		}
 
 		// Set whether the check box is checked...
 		$checked = ($fieldChecked ? ' checked="checked"' : ' ');
@@ -340,7 +340,7 @@ class HtmlFormHelper extends BaseHtmlHelper implements HelpableTemplate {
 		if (($this->formOpened === false) && ($this->formEnabled === true)) {
 			// Throw an exception
 			throw new FormClosedException (array($this, 'reset'), self::EXCEPTION_CLOSED_FORM);
-		} // END - if
+		}
 
 		// Generate the content
 		$inputContent = sprintf('<input type="reset" class="reset_button" id="%s_reset" value="%s" />',
@@ -365,7 +365,7 @@ class HtmlFormHelper extends BaseHtmlHelper implements HelpableTemplate {
 		if (($this->formOpened === false) && ($this->formEnabled === true)) {
 			// Throw an exception
 			throw new FormClosedException (array($this, 'submit'), self::EXCEPTION_CLOSED_FORM);
-		} // END - if
+		}
 
 		// Generate the content
 		$inputContent = sprintf('<input type="submit" class="submit_button" id="%s_submit" name="%s_submit" value="%s" />',
@@ -404,7 +404,7 @@ class HtmlFormHelper extends BaseHtmlHelper implements HelpableTemplate {
 		if (($this->ifGroupOpenedPreviously() === false) && ($groupId === $this->getPreviousGroupId())) {
 			// Abort here silently
 			return false;
-		} // END - if
+		}
 
 		// Initialize content with closing div by default
 		$content = "	</div>\n</div><!-- Group - CLOSE //-->";
@@ -432,7 +432,7 @@ class HtmlFormHelper extends BaseHtmlHelper implements HelpableTemplate {
 			if ($this->ifSubGroupOpenedPreviously()) {
 				// Close it here
 				$this->addFormSubGroup();
-			} // END - if
+			}
 
 			// Get previous group id
 			$prevGroupId = $this->getPreviousGroupId();
@@ -444,7 +444,7 @@ class HtmlFormHelper extends BaseHtmlHelper implements HelpableTemplate {
 			if ((!empty($groupId)) && ($groupId != $prevGroupId)) {
 				//* DEBUG: */ echo $groupId.'/'.$prevGroupId."<br />\n";
 				$this->addFormGroup($groupId, $groupText);
-			} // END - if
+			}
 		}
 	}
 
@@ -476,7 +476,7 @@ class HtmlFormHelper extends BaseHtmlHelper implements HelpableTemplate {
 		if (($this->ifSubGroupOpenedPreviously() === false) && ($subGroupId == $this->getPreviousSubGroupId())) {
 			// Abort here silently
 			return false;
-		} // END - if
+		}
 
 		// Initialize content with closing div by default
 		$content = "	</div>\n</div><!-- Sub group- CLOSE //-->";
@@ -509,7 +509,7 @@ class HtmlFormHelper extends BaseHtmlHelper implements HelpableTemplate {
 			// All call it again if sub group name is not empty
 			if ((!empty($subGroupId)) && ($subGroupId != $prevSubGroupId)) {
 				$this->addFormSubGroup($subGroupId, $subGroupText);
-			} // END - if
+			}
 		}
 	}
 
@@ -527,7 +527,7 @@ class HtmlFormHelper extends BaseHtmlHelper implements HelpableTemplate {
 		if (($this->formOpened === false) && ($this->formEnabled === true)) {
 			// Throw an exception
 			throw new FormClosedException (array($this, $fieldName), self::EXCEPTION_CLOSED_FORM);
-		} // END - if
+		}
 
 		// Default is no title attribute
 		$titleAttribute = '';
@@ -536,7 +536,7 @@ class HtmlFormHelper extends BaseHtmlHelper implements HelpableTemplate {
 		if (!empty($fieldTitle)) {
 			// Create title attribute
 			$titleAttribute = sprintf(' title="%s" data-toggle="tooltip"', $fieldTitle);
-		} // END - if
+		}
 
 		// Generate the content
 		$inputContent = sprintf('<label class="col-form-label" for="%s_%s_field"%s>
@@ -566,7 +566,7 @@ class HtmlFormHelper extends BaseHtmlHelper implements HelpableTemplate {
 		if (($this->formOpened === false) && ($this->formEnabled === true)) {
 			// Throw an exception
 			throw new FormClosedException (array($this, 'form_notes'), self::EXCEPTION_CLOSED_FORM);
-		} // END - if
+		}
 
 		// Generate the content
 		$inputContent = sprintf("	<div id=\"form_note_%s\">
@@ -594,7 +594,7 @@ class HtmlFormHelper extends BaseHtmlHelper implements HelpableTemplate {
 		if (($this->formOpened === false) && ($this->formEnabled === true)) {
 			// Throw an exception
 			throw new FormClosedException (array($this, 'form_notes'), self::EXCEPTION_CLOSED_FORM);
-		} // END - if
+		}
 
 		// Shall we close or open the sub group?
 		if (($this->ifSubGroupOpenedPreviously() === false) && ($this->getPreviousSubGroupId() !== $selectId)) {
@@ -604,7 +604,7 @@ class HtmlFormHelper extends BaseHtmlHelper implements HelpableTemplate {
 				$firstEntry = sprintf("<option value=\"invalid\" disabled=\"disabled\">%s</option>\n",
 					$firstEntry
 				);
-			} // END - if
+			}
 
 			// Construct the opening select tag
 			$content = sprintf("<select class=\"select_box\" id=\"%s_%s\" name=\"%s\">\n%s",
@@ -641,7 +641,7 @@ class HtmlFormHelper extends BaseHtmlHelper implements HelpableTemplate {
 		if ($this->ifSubGroupOpenedPreviously() === false) {
 			// Then throw an exception here
 			throw new HelperNoPreviousOpenedSubGroupException(array($this, $content), self::EXCEPTION_NO_PREVIOUS_SUB_GROUP_OPENED);
-		} // END - if
+		}
 
 		// Render the content
 		$content = sprintf("<option value=\"invalid\" class=\"suboption suboption_%s\" disabled=\"disabled\">%s</option>\n",
@@ -669,7 +669,7 @@ class HtmlFormHelper extends BaseHtmlHelper implements HelpableTemplate {
 		if ($this->ifSubGroupOpenedPreviously() === false) {
 			// Then throw an exception here
 			throw new HelperNoPreviousOpenedSubGroupException(array($this, $content), self::EXCEPTION_NO_PREVIOUS_SUB_GROUP_OPENED);
-		} // END - if
+		}
 
 		// Render the content
 		$content = sprintf("<option value=\"%s\" class=\"option option_%s\">%s</option>\n",
diff --git a/framework/main/classes/helper/html/links/class_HtmlLinkHelper.php b/framework/main/classes/helper/html/links/class_HtmlLinkHelper.php
index d61d83cd..9871126c 100644
--- a/framework/main/classes/helper/html/links/class_HtmlLinkHelper.php
+++ b/framework/main/classes/helper/html/links/class_HtmlLinkHelper.php
@@ -95,7 +95,7 @@ class HtmlLinkHelper extends BaseHtmlHelper implements HelpableTemplate {
 		if (is_null($requestInstance)) {
 			// Throw an exception here
 			throw new NullPointerException($helperInstance, self::EXCEPTION_IS_NULL_POINTER);
-		} // END - if
+		}
 
 		// Get page (this will throw an exception if not set)
 		$command = StringUtils::convertDashesToUnderscores($requestInstance->getRequestElement('command'));
@@ -107,7 +107,7 @@ class HtmlLinkHelper extends BaseHtmlHelper implements HelpableTemplate {
 		if (!is_null($linkBase)) {
 			// Then output a deprecation message
 			$helperInstance->deprecationWarning('[' . __METHOD__ . ':' . __LINE__ . ']:  linkBase is deprecated. Please remove it from your templates and add a config entry ' . $configEntry . ' in your config.php file.');
-		} // END - if
+		}
 
 		// Determine link base from config now and 'command' request
 		try {
@@ -118,7 +118,7 @@ class HtmlLinkHelper extends BaseHtmlHelper implements HelpableTemplate {
 			if (is_null($linkBase)) {
 				// Then throw again the exception
 				throw new NoConfigEntryException(array(__CLASS__, ($configEntry)), FrameworkConfiguration::EXCEPTION_CONFIG_ENTRY_WAS_NOT_FOUND);
-			} // END - if
+			}
 		}
 
 		// Set link base
@@ -202,7 +202,7 @@ class HtmlLinkHelper extends BaseHtmlHelper implements HelpableTemplate {
 		if ($this->ifGroupOpenedPreviously()) {
 			// Then close it
 			$this->closePreviousGroupByContent('');
-		} // END - if
+		}
 
 		// Get the content
 		$content = $this->renderContent();
@@ -228,7 +228,7 @@ class HtmlLinkHelper extends BaseHtmlHelper implements HelpableTemplate {
 		if ($this->ifGroupOpenedPreviously()) {
 			// Then close it here
 			$this->closePreviousGroupByContent('');
-		} // END - if
+		}
 
 		// Generate the group content
 		$content = sprintf('<%s id="group_%s_%s">%s',
@@ -257,13 +257,13 @@ class HtmlLinkHelper extends BaseHtmlHelper implements HelpableTemplate {
 		if ($this->ifGroupOpenedPreviously() === false) {
 			// No group was opened before!
 			throw new NoGroupOpenedException(array($this, $groupNote), self::EXCEPTION_GROUP_NOT_OPENED);
-		} // END - if
+		}
 
 		// Is a previous sub group open?
 		if ($this->ifSubGroupOpenedPreviously()) {
 			// Then close it
 			$this->closePreviousSubGroupByContent('</' . $groupCode . '>');
-		} // END - if
+		}
 
 		// Generate the group content
 		$content = sprintf('<%s id="subgroup_%s_%s">%s',
@@ -290,7 +290,7 @@ class HtmlLinkHelper extends BaseHtmlHelper implements HelpableTemplate {
 		if ($this->ifGroupOpenedPreviously() === false) {
 			// No group was opened before!
 			throw new NoGroupOpenedException(array($this, $linkAction . '(' . $linkText . ')'), self::EXCEPTION_GROUP_NOT_OPENED);
-		} // END - if
+		}
 
 		// Default parameter SEPARATOR is &amp;
 		$separator = self::EXTRA_PARAMETER_SEPARATOR;
@@ -300,7 +300,7 @@ class HtmlLinkHelper extends BaseHtmlHelper implements HelpableTemplate {
 		if (count($linkArray) == 0) {
 			// No question mark
 			$separator = self::FIRST_PARAMETER_SEPARATOR;
-		} // END - if
+		}
 
 		// Prepare action
 		$action = sprintf('%saction=%s',
diff --git a/framework/main/classes/images/class_BaseImage.php b/framework/main/classes/images/class_BaseImage.php
index b7e9f6cc..0efd8f96 100644
--- a/framework/main/classes/images/class_BaseImage.php
+++ b/framework/main/classes/images/class_BaseImage.php
@@ -533,7 +533,7 @@ abstract class BaseImage extends BaseFrameworkSystem implements Registerable {
 					// Set the image string
 					//* DEBUG: */ print __METHOD__.": size={$size}, x={$x}, y={$y}, string={$imageString}<br />\n";
 					imagestring($this->getImageResource(), $size, $x, $y, $imageString, $foreColor);
-				} // END - foreach
+				}
 				break;
 		}
 
diff --git a/framework/main/classes/iterator/default/class_DefaultIterator.php b/framework/main/classes/iterator/default/class_DefaultIterator.php
index cdceda7d..c7f8e132 100644
--- a/framework/main/classes/iterator/default/class_DefaultIterator.php
+++ b/framework/main/classes/iterator/default/class_DefaultIterator.php
@@ -79,7 +79,7 @@ class DefaultIterator extends BaseIterator implements Iterator, Registerable {
 		if (!$this->valid()) {
 			// Throw an exception here
 			throw new IndexOutOfBoundsException($this->key(), self::EXCEPTION_INDEX_OUT_OF_BOUNDS);
-		} // END - if
+		}
 
 		// Now get the entry
 		$current = $this->getListInstance()->getEntry($this->key());
diff --git a/framework/main/classes/iterator/registry/class_RegistryIterator.php b/framework/main/classes/iterator/registry/class_RegistryIterator.php
index 781e38a4..b0a28dc5 100644
--- a/framework/main/classes/iterator/registry/class_RegistryIterator.php
+++ b/framework/main/classes/iterator/registry/class_RegistryIterator.php
@@ -124,7 +124,7 @@ class RegistryIterator extends BaseIterator implements IteratableRegistry {
 		if (count($entries) > 0) {
 			// Debugging:
 			/* DEBUG-DIE: */ ApplicationEntryPoint::exitApplication(sprintf('[%s:%d]: UNFINISHED: entries=%s', __METHOD__, __LINE__, print_r($entries, TRUE)));
-		} // END - if
+		}
 
 		// Get instance registry entries from it
 		$entries = $this->getRegistryInstance()->getInstanceRegistry();
@@ -185,8 +185,8 @@ class RegistryIterator extends BaseIterator implements IteratableRegistry {
 				//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('REGISTRY-ITERATOR[instance]: key=%s - Adding ...', $key));
 				//* DEBUG-DIE: */ ApplicationEntryPoint::exitApplication(sprintf('[%s:%d]: key=%s,entry=%s', __METHOD__, __LINE__, $key, print_r($entry, TRUE)));
 				array_push($this->registryKeys['instance'], $key);
-			} // END - foreach
-		} // END - if
+			}
+		}
 
 		// Trace message
 		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('REGISTRY-ITERATOR: EXIT!');
diff --git a/framework/main/classes/language/class_LanguageSystem.php b/framework/main/classes/language/class_LanguageSystem.php
index 483acb1a..2fc352a6 100644
--- a/framework/main/classes/language/class_LanguageSystem.php
+++ b/framework/main/classes/language/class_LanguageSystem.php
@@ -95,7 +95,7 @@ class LanguageSystem extends BaseFrameworkSystem implements ManageableLanguage,
 				FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('application_base_path'),
 				$applicationInstance->getAppShortName()
 			);
-		} // END - if
+		}
 
 		// Is the base path valid?
 		if (empty($languageBasePath)) {
@@ -213,7 +213,7 @@ class LanguageSystem extends BaseFrameworkSystem implements ManageableLanguage,
 		if ($this->langStrings->offsetExists($messageId)) {
 			// Return the message string
 			$messageText = $this->langStrings->offsetGet($messageId);
-		} // END - if
+		}
 
 		// Return the text
 		return $messageText;
diff --git a/framework/main/classes/mailer/debug/class_DebugMailer.php b/framework/main/classes/mailer/debug/class_DebugMailer.php
index a1e58a51..7a606f9e 100644
--- a/framework/main/classes/mailer/debug/class_DebugMailer.php
+++ b/framework/main/classes/mailer/debug/class_DebugMailer.php
@@ -126,8 +126,8 @@ class DebugMailer extends BaseMailer implements DeliverableMail {
 
 				// Transfer the data to the response
 				$templateInstance->transferToResponse($responseInstance);
-			} // END - foreach
-		} // END - foreach
+			}
+		}
 	}
 
 	/**
diff --git a/framework/main/classes/output/class_ b/framework/main/classes/output/class_
index 7fd46736..6eb9f1a1 100644
--- a/framework/main/classes/output/class_
+++ b/framework/main/classes/output/class_
@@ -63,8 +63,8 @@ class ???Output extends BaseOutput implements OutputStreamer, Registerable {
 			if (!empty($contentType)) {
 				// Set the header
 				FrameworkBootstrap::getResponseInstance()->addHeader('Content-type', $contentType);
-			} // END - if
-		} // END - if
+			}
+		}
 
 		// Return instance
 		return self::$!!!Instance;
diff --git a/framework/main/classes/output/console/class_ConsoleOutput.php b/framework/main/classes/output/console/class_ConsoleOutput.php
index 545e27b4..25b5527f 100644
--- a/framework/main/classes/output/console/class_ConsoleOutput.php
+++ b/framework/main/classes/output/console/class_ConsoleOutput.php
@@ -66,7 +66,7 @@ class ConsoleOutput extends BaseOutput implements OutputStreamer {
 			@header(sprintf('Content-type: %s',
 				$contentType
 			));
-		} // END - if
+		}
 
 		// Return instance
 		return self::$consoleInstance;
@@ -82,7 +82,7 @@ class ConsoleOutput extends BaseOutput implements OutputStreamer {
 		if (is_null(self::$consoleInstance)) {
 			$contentType = FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('web_content_type');
 			self::$consoleInstance = ConsoleOutput::createConsoleOutput($contentType);
-		} // END - if
+		}
 
 		// Return the instance
 		return self::$consoleInstance;
diff --git a/framework/main/classes/output/debug/error/class_DebugErrorLogOutput.php b/framework/main/classes/output/debug/error/class_DebugErrorLogOutput.php
index 00594418..b0b8cb08 100644
--- a/framework/main/classes/output/debug/error/class_DebugErrorLogOutput.php
+++ b/framework/main/classes/output/debug/error/class_DebugErrorLogOutput.php
@@ -74,8 +74,8 @@ class DebugErrorLogOutput extends BaseDebugOutput implements Debugger, OutputStr
 			if (!empty($err)) {
 				// Log this line
 				error_log(html_entity_decode(strip_tags($err)), 0);
-			} // END - if
-		} // END - foreach
+			}
+		}
 	}
 
 	/**
diff --git a/framework/main/classes/points/class_UserPoints.php b/framework/main/classes/points/class_UserPoints.php
index 523698fd..0110e689 100644
--- a/framework/main/classes/points/class_UserPoints.php
+++ b/framework/main/classes/points/class_UserPoints.php
@@ -134,7 +134,7 @@ class UserPoints extends BaseFrameworkSystem implements Registerable, BookablePo
 
 			// Has he enought points?
 			$hasRequired = ($currEntry['points'] >= $requiredPoints);
-		} // END - if
+		}
 
 		// Return the result
 		return $hasRequired;
diff --git a/framework/main/classes/registry/class_ b/framework/main/classes/registry/class_
index 3d679d40..c3620c35 100644
--- a/framework/main/classes/registry/class_
+++ b/framework/main/classes/registry/class_
@@ -55,7 +55,7 @@ class ???Registry extends BaseRegistry implements Register {
 		if (is_null(self::$registryInstance)) {
 			// Not yet, so create one
 			self::$registryInstance = new ???Registry();
-		} // END - if
+		}
 
 		// Return the instance
 		return self::$registryInstance;
diff --git a/framework/main/classes/registry/format_upgrade/database/class_ b/framework/main/classes/registry/format_upgrade/database/class_
index 5a7db692..24e19b23 100644
--- a/framework/main/classes/registry/format_upgrade/database/class_
+++ b/framework/main/classes/registry/format_upgrade/database/class_
@@ -48,7 +48,7 @@ class ???FormatUpgradeRegistry extends BaseRegistry implements RegisterableForma
 		if (is_null(self::$registryInstance)) {
 			// Not yet, so create one
 			self::$registryInstance = new ???FormatUpgradeRegistry();
-		} // END - if
+		}
 
 		// Return the instance
 		return self::$registryInstance;
diff --git a/framework/main/classes/registry/format_upgrade/database/class_LocalFileDatabaseFormatUpgradeRegistry.php b/framework/main/classes/registry/format_upgrade/database/class_LocalFileDatabaseFormatUpgradeRegistry.php
index d3a28921..ecc6478e 100644
--- a/framework/main/classes/registry/format_upgrade/database/class_LocalFileDatabaseFormatUpgradeRegistry.php
+++ b/framework/main/classes/registry/format_upgrade/database/class_LocalFileDatabaseFormatUpgradeRegistry.php
@@ -56,7 +56,7 @@ class LocalFileDatabaseFormatUpgradeRegistry extends BaseRegistry implements Reg
 		if (is_null(self::$registryInstance)) {
 			// Not yet, so create one
 			self::$registryInstance = new LocalFileDatabaseFormatUpgradeRegistry();
-		} // END - if
+		}
 
 		// Return the instance
 		return self::$registryInstance;
diff --git a/framework/main/classes/registry/generic/class_GenericRegistry.php b/framework/main/classes/registry/generic/class_GenericRegistry.php
index aa0dc486..78116226 100644
--- a/framework/main/classes/registry/generic/class_GenericRegistry.php
+++ b/framework/main/classes/registry/generic/class_GenericRegistry.php
@@ -52,7 +52,7 @@ class GenericRegistry extends BaseRegistry implements Register {
 		if (is_null(self::$registryInstance)) {
 			// Not yet, so create one
 			self::$registryInstance = new GenericRegistry();
-		} // END - if
+		}
 
 		// Return the instance
 		return self::$registryInstance;
diff --git a/framework/main/classes/request/class_BaseRequest.php b/framework/main/classes/request/class_BaseRequest.php
index bab53204..d70fe58e 100644
--- a/framework/main/classes/request/class_BaseRequest.php
+++ b/framework/main/classes/request/class_BaseRequest.php
@@ -82,7 +82,7 @@ abstract class BaseRequest extends BaseFrameworkSystem {
 
 			// Secure it against attacks
 			$value = htmlentities(strip_tags($value), ENT_QUOTES);
-		} // END - if
+		}
 
 		// Return the element's value
 		return $value;
diff --git a/framework/main/classes/request/console/class_ConsoleRequest.php b/framework/main/classes/request/console/class_ConsoleRequest.php
index f7fec02d..c8b91d7b 100644
--- a/framework/main/classes/request/console/class_ConsoleRequest.php
+++ b/framework/main/classes/request/console/class_ConsoleRequest.php
@@ -65,7 +65,7 @@ class ConsoleRequest extends BaseRequest implements Requestable {
 		if ((!isset($_SERVER['argv'])) || (!isset($_SERVER['argc']))) {
 			// Maybe not right PHP mode? (needs CLI?)
 			trigger_error(sprintf('[%s:%d]: argv/argc not set: %s', __METHOD__, __LINE__, print_r($_SERVER, true)), E_USER_ERROR);
-		} // END - if
+		}
 
 		// Get the "request data" from the command-line argument list
 		$args = $_SERVER['argv'];
@@ -74,13 +74,13 @@ class ConsoleRequest extends BaseRequest implements Requestable {
 		if ($_SERVER['argc'] < 2) {
 			// Skip this
 			return;
-		} // END - if
+		}
 
 		// Is the first element "index.php" ?
 		if ($args[0] == 'index.php') {
 			// Then remove it
 			array_shift($args);
-		} // END - if
+		}
 
 		// Try to determine next parameters
 		foreach ($args as $arg) {
@@ -95,7 +95,7 @@ class ConsoleRequest extends BaseRequest implements Requestable {
 				// Set a name=value pair escaped and secured
 				$this->setRequestElement($argArray[0], escapeshellcmd($argArray[1]));
 			}
-		} // END - foreach
+		}
 	}
 
 	/**
diff --git a/framework/main/classes/request/html/class_HtmlRequest.php b/framework/main/classes/request/html/class_HtmlRequest.php
index 5620782a..ae79f709 100644
--- a/framework/main/classes/request/html/class_HtmlRequest.php
+++ b/framework/main/classes/request/html/class_HtmlRequest.php
@@ -114,7 +114,7 @@ class HtmlRequest extends BaseRequest implements Requestable {
 		// Does this header exist?
 		if (isset($_SERVER[$name])) {
 			$headerValue = $_SERVER[$name];
-		} // END - if
+		}
 
 		// Return the value
 		return $headerValue;
@@ -143,7 +143,7 @@ class HtmlRequest extends BaseRequest implements Requestable {
 		if (isset($_COOKIE[$cookieName])) {
 			// Then get it
 			$cookieValue = $_COOKIE[$cookieName];
-		} // END - if
+		}
 
 		// Return the value
 		return $cookieValue;
diff --git a/framework/main/classes/resolver/action/html/class_HtmlActionResolver.php b/framework/main/classes/resolver/action/html/class_HtmlActionResolver.php
index 54d5fd76..55a313e8 100644
--- a/framework/main/classes/resolver/action/html/class_HtmlActionResolver.php
+++ b/framework/main/classes/resolver/action/html/class_HtmlActionResolver.php
@@ -97,13 +97,13 @@ class HtmlActionResolver extends BaseActionResolver implements ActionResolver {
 		// Is the action empty? Then fall back to default action
 		if (empty($actionName)) {
 			$actionName = FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('default_action');
-		} // END - if
+		}
 
 		// Check if action is valid
 		if ($this->isActionValid($actionName) === false) {
 			// This action is invalid!
 			throw new InvalidActionException(array($this, $actionName), self::EXCEPTION_INVALID_ACTION);
-		} // END - if
+		}
 
 		// Get the action
 		$actionInstance = $this->loadAction();
@@ -112,7 +112,7 @@ class HtmlActionResolver extends BaseActionResolver implements ActionResolver {
 		if ((!is_object($actionInstance)) || (!$actionInstance instanceof Actionable)) {
 			// This action has an invalid instance!
 			throw new InvalidActionInstanceException(array($this, $actionName), self::EXCEPTION_INVALID_ACTION);
-		} // END - if
+		}
 
 		// Set last action
 		$this->setResolvedInstance($actionInstance);
@@ -137,13 +137,13 @@ class HtmlActionResolver extends BaseActionResolver implements ActionResolver {
 		// Is the action empty? Then fall back to default action
 		if (empty($actionName)) {
 			$actionName = FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('default_action');
-		} // END - if
+		}
 
 		// Check if action is valid
 		if ($this->isActionValid($actionName) === false) {
 			// This action is invalid!
 			throw new InvalidActionException(array($this, $actionName), self::EXCEPTION_INVALID_ACTION);
-		} // END - if
+		}
 
 		// Get the action
 		$actionInstance = $this->loadAction();
diff --git a/framework/main/classes/resolver/class_ b/framework/main/classes/resolver/class_
index 21a0859a..d9fcab2a 100644
--- a/framework/main/classes/resolver/class_
+++ b/framework/main/classes/resolver/class_
@@ -90,7 +90,7 @@ class ???Resolver extends BaseResolver implements Resolver {
 		if ($this->is|||Valid($!!!Name) === false) {
 			// This action is invalid!
 			throw new Invalid|||Exception(array($this, $!!!Name), self::EXCEPTION_INVALID_ACTION);
-		} // END - if
+		}
 
 		// Get the action
 		$!!!Instance = $this->load|||();
@@ -99,7 +99,7 @@ class ???Resolver extends BaseResolver implements Resolver {
 		if ((!is_object($!!!Instance)) || (!$!!!Instance instanceof |||able)) {
 			// This action has an invalid instance!
 			throw new Invalid|||InstanceException(array($this, $!!!Name), self::EXCEPTION_INVALID_ACTION);
-		} // END - if
+		}
 
 		// Set last action
 		$this->setResolvedInstance($!!!Instance);
@@ -124,13 +124,13 @@ class ???Resolver extends BaseResolver implements Resolver {
 		// Is the action empty? Then fall back to default action
 		if (empty($!!!Name)) {
 			$!!!Name = FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('default_action');
-		} // END - if
+		}
 
 		// Check if action is valid
 		if ($this->is|||Valid($!!!Name) === false) {
 			// This action is invalid!
 			throw new Invalid|||Exception(array($this, $!!!Name), self::EXCEPTION_INVALID_ACTION);
-		} // END - if
+		}
 
 		// Get the action
 		$!!!Instance = $this->load|||();
diff --git a/framework/main/classes/response/class_BaseResponse.php b/framework/main/classes/response/class_BaseResponse.php
index f2307340..8bc2d373 100644
--- a/framework/main/classes/response/class_BaseResponse.php
+++ b/framework/main/classes/response/class_BaseResponse.php
@@ -200,7 +200,7 @@ abstract class BaseResponse extends BaseFrameworkSystem {
 			foreach ($this->responseHeaders as $name => $value) {
 				header($name . ': ' . $value);
 				//* DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('name=' . $name . ',value=' . $value);
-			} // END - foreach
+			}
 
 			// Send cookies out?
 			if (count($this->cookies) > 0) {
@@ -210,7 +210,7 @@ abstract class BaseResponse extends BaseFrameworkSystem {
 
 				// Remove them all
 				$this->cookies = [];
-			} // END - if
+			}
 		}
 
 		// Are there some error messages?
diff --git a/framework/main/classes/response/html/class_HtmlResponse.php b/framework/main/classes/response/html/class_HtmlResponse.php
index ebfb0a26..4150ca9d 100644
--- a/framework/main/classes/response/html/class_HtmlResponse.php
+++ b/framework/main/classes/response/html/class_HtmlResponse.php
@@ -81,13 +81,13 @@ class HtmlResponse extends BaseResponse implements Responseable {
 			// Throw an exception here
 			//* DEBUG: */ return;
 			throw new ResponseHeadersAlreadySentException($this, self::EXCEPTION_HEADERS_ALREADY_SENT);
-		} // END - if
+		}
 
 		// Shall we encrypt the cookie?
 		if ($encrypted) {
 			// Unsupported at the moment
 			$this->partialStub('Encryption is unsupported at the moment.');
-		} // END - if
+		}
 
 		// For slow browsers set the cookie array element first
 		$_COOKIE[$cookieName] = $cookieValue;
@@ -95,7 +95,7 @@ class HtmlResponse extends BaseResponse implements Responseable {
 		// Get all config entries
 		if (is_null($expires)) {
 			$expires = (time() + FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('cookie_expire'));
-		} // END - if
+		}
 
 		$path = FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('cookie_path');
 		$domain = FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('cookie_domain');
@@ -129,7 +129,7 @@ class HtmlResponse extends BaseResponse implements Responseable {
 		if (headers_sent()) {
 			// Throw an exception here
 			throw new ResponseHeadersAlreadySentException($this, self::EXCEPTION_HEADERS_ALREADY_SENT);
-		} // END - if
+		}
 
 		// Assign application data
 		$this->getTemplateInstance()->assignApplicationData($applicationInstance);
@@ -145,11 +145,11 @@ class HtmlResponse extends BaseResponse implements Responseable {
 			// Is there a / in front of the relative URL?
 			if (substr($url, 0, 1) == '/') {
 				$url = substr($url, 1);
-			} // END - if
+			}
 
 			// No, then extend it with our base URL
 			$url = FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('base_url') . '/' . $url;
-		} // END - if
+		}
 
 		// Add redirect header
 		$this->addHeader('Location', str_replace('&amp;', '&', $url));
@@ -181,7 +181,7 @@ class HtmlResponse extends BaseResponse implements Responseable {
 
 			// Remove it from array
 			unset($_COOKIE[$cookieName]);
-		} // END - if
+		}
 	}
 
 	/**
@@ -195,7 +195,7 @@ class HtmlResponse extends BaseResponse implements Responseable {
 		if (isset($_COOKIE[$cookieName])) {
 			// Update the cookie
 			$this->addCookie($cookieName, $_COOKIE[$cookieName], false);
-		} // END - if
+		}
 	}
 
 }
diff --git a/framework/main/classes/response/image/class_ImageResponse.php b/framework/main/classes/response/image/class_ImageResponse.php
index 75b3b1ba..d8531206 100644
--- a/framework/main/classes/response/image/class_ImageResponse.php
+++ b/framework/main/classes/response/image/class_ImageResponse.php
@@ -118,7 +118,7 @@ class ImageResponse extends BaseResponse implements Responseable {
 		// Get all config entries
 		if (is_null($expires)) {
 			$expires = (time() + FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('cookie_expire'));
-		} // END - if
+		}
 
 		$path = FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('cookie_path');
 		$domain = FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('cookie_domain');
@@ -152,7 +152,7 @@ class ImageResponse extends BaseResponse implements Responseable {
 		if (headers_sent()) {
 			// Throw an exception here
 			throw new ResponseHeadersAlreadySentException($this, self::EXCEPTION_HEADERS_ALREADY_SENT);
-		} // END - if
+		}
 
 		// Assign application data
 		$this->getTemplateInstance()->assignApplicationData($applicationInstance);
@@ -170,7 +170,7 @@ class ImageResponse extends BaseResponse implements Responseable {
 
 			// No, then extend it with our base URL
 			$url = FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('base_url') . '/' . $url;
-		} // END - if
+		}
 
 		// Add redirect header
 		$this->addHeader('Location', str_replace('&amp;', '&', $url));
@@ -226,7 +226,7 @@ class ImageResponse extends BaseResponse implements Responseable {
 
 			// Remove it from array
 			unset($_COOKIE[$cookieName]);
-		} // END - if
+		}
 	}
 
 	/**
@@ -240,7 +240,7 @@ class ImageResponse extends BaseResponse implements Responseable {
 		if (isset($_COOKIE[$cookieName])) {
 			// Update the cookie
 			$this->addCookie($cookieName, $_COOKIE[$cookieName], false);
-		} // END - if
+		}
 	}
 
 }
diff --git a/framework/main/classes/rng/class_RandomNumberGenerator.php b/framework/main/classes/rng/class_RandomNumberGenerator.php
index 803ff0b7..57b1a6f6 100644
--- a/framework/main/classes/rng/class_RandomNumberGenerator.php
+++ b/framework/main/classes/rng/class_RandomNumberGenerator.php
@@ -122,7 +122,7 @@ class RandomNumberGenerator extends BaseFrameworkSystem {
 		if (FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('is_single_server') == 'Y') {
 			// Then use that IP for extra security
 			$serverIp = FrameworkBootstrap::detectServerAddress();
-		} // END - if
+		}
 
 		// Yet-another fixed salt. This is not dependend on server software or date
 		if ($extraInstance instanceof FrameworkInterface) {
@@ -159,7 +159,7 @@ class RandomNumberGenerator extends BaseFrameworkSystem {
 		// Is the number <1, then fix it to default length
 		if ($length < 1) {
 			$length = $this->rndStrLen;
-		} // END - if
+		}
 
 		// Initialize the string
 		$randomString = '';
@@ -168,7 +168,7 @@ class RandomNumberGenerator extends BaseFrameworkSystem {
 		for ($idx = 0; $idx < $length; $idx++) {
 			// Add a random character and add it to our string
 			$randomString .= chr($this->randomNumber(0, 255));
-		} // END - for
+		}
 
 		// Return the random string a little mixed up
 		return str_shuffle($randomString);
@@ -216,7 +216,7 @@ class RandomNumberGenerator extends BaseFrameworkSystem {
 		// Get key
 		if (FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('crypt_fixed_salt') == 'Y') {
 			$key = md5($this->getFixedSalt());
-		} // END - if
+		}
 
 		// Return it
 		return $key;
diff --git a/framework/main/classes/template/image/class_ImageTemplateEngine.php b/framework/main/classes/template/image/class_ImageTemplateEngine.php
index c9268cfe..80a81446 100644
--- a/framework/main/classes/template/image/class_ImageTemplateEngine.php
+++ b/framework/main/classes/template/image/class_ImageTemplateEngine.php
@@ -262,7 +262,7 @@ class ImageTemplateEngine extends BaseTemplateEngine implements CompileableTempl
 		if (empty($characters)) {
 			// Then skip it silently
 			return;
-		} // END - if
+		}
 
 		// Unfinished work!
 		$this->partialStub('Handling extra characters is not yet supported!');
diff --git a/framework/main/classes/template/mail/class_MailTemplateEngine.php b/framework/main/classes/template/mail/class_MailTemplateEngine.php
index 2f80bf29..44dfeb05 100644
--- a/framework/main/classes/template/mail/class_MailTemplateEngine.php
+++ b/framework/main/classes/template/mail/class_MailTemplateEngine.php
@@ -232,7 +232,7 @@ class MailTemplateEngine extends BaseTemplateEngine implements CompileableTempla
 		if (empty($characters)) {
 			// Then skip it silently
 			return;
-		} // END - if
+		}
 
 		// Add the message now
 		$this->assignVariable('message', $characters);
diff --git a/framework/main/classes/template/xml/class_BaseXmlTemplateEngine.php b/framework/main/classes/template/xml/class_BaseXmlTemplateEngine.php
index 7ae3382a..cbbf4a73 100644
--- a/framework/main/classes/template/xml/class_BaseXmlTemplateEngine.php
+++ b/framework/main/classes/template/xml/class_BaseXmlTemplateEngine.php
@@ -179,7 +179,7 @@ abstract class BaseXmlTemplateEngine extends BaseTemplateEngine implements Compi
 		if (empty($templateName)) {
 			// Set generic template name
 			$templateName = $this->typePrefix . '_' . $this->xmlTemplateType . '_template_type';
-		} // END - if
+		}
 
 		// Set template type
 		$this->setTemplateType(FrameworkBootstrap::getConfigurationInstance()->getConfigEntry($templateName));
@@ -266,7 +266,7 @@ abstract class BaseXmlTemplateEngine extends BaseTemplateEngine implements Compi
 		if (is_null($value)) {
 			// Bah, needs fixing.
 			$this->debugInstance(sprintf('[%s:%d]: key=%s returns NULL', __METHOD__, __LINE__, $key));
-		} // END - if
+		}
 
 		// Return value
 		return $value;
@@ -296,7 +296,7 @@ abstract class BaseXmlTemplateEngine extends BaseTemplateEngine implements Compi
 
 			// Save the parsed raw content in our dependency array
 			$this->dependencyContent[$node] = $templateInstance->getRawTemplateData();
-		} // END - if
+		}
 	}
 
 	/**
@@ -352,7 +352,7 @@ abstract class BaseXmlTemplateEngine extends BaseTemplateEngine implements Compi
 		if (($nodeName != $this->getCurrMainNode()) && (in_array($nodeName, $this->getMainNodes()))) {
 			// Did not match!
 			throw new XmlNodeMismatchException (array($this, $nodeName, $this->getCurrMainNode()), XmlParser::EXCEPTION_XML_NODE_MISMATCH);
-		} // END - if
+		}
 
 		// Construct method name
 		$methodName = 'finish' . StringUtils::convertToClassName($nodeName);
diff --git a/framework/main/classes/user/class_BaseUser.php b/framework/main/classes/user/class_BaseUser.php
index 07ec57f1..468f235d 100644
--- a/framework/main/classes/user/class_BaseUser.php
+++ b/framework/main/classes/user/class_BaseUser.php
@@ -157,7 +157,7 @@ abstract class BaseUser extends BaseFrameworkSystem implements Updateable {
 
 			// And finally set it
 			$this->setResultInstance($resultInstance);
-		} // END - if
+		}
 
 		// Rewind it
 		$this->getResultInstance()->rewind();
@@ -166,7 +166,7 @@ abstract class BaseUser extends BaseFrameworkSystem implements Updateable {
 		if ($this->getResultInstance()->valid()) {
 			// Entry found
 			$exists = true;
-		} // END - if
+		}
 
 		// Return the status
 		return $exists;
@@ -201,7 +201,7 @@ abstract class BaseUser extends BaseFrameworkSystem implements Updateable {
 
 			// And finally set it
 			$this->setResultInstance($resultInstance);
-		} // END - if
+		}
 
 		// Rewind it
 		$this->getResultInstance()->rewind();
@@ -218,8 +218,8 @@ abstract class BaseUser extends BaseFrameworkSystem implements Updateable {
 
 				// Set the username
 				$this->setUserName($currEntry['username']);
-			} // END - if
-		} // END - if
+			}
+		}
 
 		// Return the status
 		return $exists;
@@ -256,7 +256,7 @@ abstract class BaseUser extends BaseFrameworkSystem implements Updateable {
 
 			// And finally set it
 			$this->setResultInstance($resultInstance);
-		} // END - if
+		}
 
 		// Rewind it and advance to first entry
 		$this->getResultInstance()->rewind();
@@ -269,7 +269,7 @@ abstract class BaseUser extends BaseFrameworkSystem implements Updateable {
 			// So does the hashes match?
 			//* DEBUG: */ echo $requestInstance->getRequestElement('pass_hash') . '<br />' . $this->getResultInstance()->getFoundValue() . '<br />';
 			$matches = ($requestInstance->getRequestElement('pass_hash') === $this->getResultInstance()->getFoundValue());
-		} // END - if
+		}
 
 		// Return the status
 		return $matches;
@@ -291,7 +291,7 @@ abstract class BaseUser extends BaseFrameworkSystem implements Updateable {
 		if (isset($entry['pass_hash'])) {
 			// Get it
 			$passHash = $entry['pass_hash'];
-		} // END - if
+		}
 
 		// And return the hash
 		return $passHash;
diff --git a/framework/main/classes/user/member/class_Member.php b/framework/main/classes/user/member/class_Member.php
index dbf87225..34e06271 100644
--- a/framework/main/classes/user/member/class_Member.php
+++ b/framework/main/classes/user/member/class_Member.php
@@ -132,7 +132,7 @@ class Member extends BaseUser implements ManageableMember, Registerable {
 		// If there is no action use the default on
 		if (is_null($lastAction)) {
 			$lastAction = FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('login_default_action');
-		} // END - if
+		}
 
 		// Get a critieria instance
 		$searchInstance = ObjectFactory::createObjectByConfiguredName('search_criteria_class');
diff --git a/framework/main/classes/utils/strings/class_StringUtils.php b/framework/main/classes/utils/strings/class_StringUtils.php
index 257d325d..c95dc11d 100644
--- a/framework/main/classes/utils/strings/class_StringUtils.php
+++ b/framework/main/classes/utils/strings/class_StringUtils.php
@@ -428,7 +428,7 @@ final class StringUtils extends BaseFrameworkSystem {
 			//* NOISY-DEBUG */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('STRING-UTILS: big=%d,chunk(%d)=%s', $big, strlen($chunk), md5($chunk)));
 
 			$packed .= $chunk;
-		} // END - for
+		}
 
 		// Return it
 		//* NOISY-DEBUG */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('STRING-UTILS: packed=%s - EXIT!', $packed));
diff --git a/framework/main/exceptions/class_FrameworkException.php b/framework/main/exceptions/class_FrameworkException.php
index d7bbe1c4..ebee4d48 100644
--- a/framework/main/exceptions/class_FrameworkException.php
+++ b/framework/main/exceptions/class_FrameworkException.php
@@ -129,7 +129,7 @@ abstract class FrameworkException extends ReflectionException {
 					if (!is_array($debug)) {
 						$info .= $debug . ', ';
 					}
-				} // END - foreach
+				}
 
 				// Remove last chars (commata, space)
 				$info = substr($info, 0, -2);
diff --git a/framework/main/middleware/compressor/class_CompressorChannel.php b/framework/main/middleware/compressor/class_CompressorChannel.php
index 798f6e48..79d83456 100644
--- a/framework/main/middleware/compressor/class_CompressorChannel.php
+++ b/framework/main/middleware/compressor/class_CompressorChannel.php
@@ -106,7 +106,7 @@ class CompressorChannel extends BaseMiddleware implements Registerable {
 					// No more searches required because we have found a valid compressor stream
 					break;
 				}
-			} // END - while
+			}
 
 			// Close the directory
 			$directoryInstance->closeDirectory();
diff --git a/framework/main/tests/controller/console/class_TestsConsoleDefaultNewsController.php b/framework/main/tests/controller/console/class_TestsConsoleDefaultNewsController.php
index adfe0459..1fabb5a2 100644
--- a/framework/main/tests/controller/console/class_TestsConsoleDefaultNewsController.php
+++ b/framework/main/tests/controller/console/class_TestsConsoleDefaultNewsController.php
@@ -46,7 +46,7 @@ class TestsConsoleDefaultNewsController extends BaseController implements Contro
 		// Init additional filter chains
 		foreach (array('bootstrap', 'tests', 'shutdown') as $filterChain) {
 			$this->initFilterChain($filterChain);
-		} // END - foreach
+		}
 	}
 
 	/**
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 6e479a71..b2428e8e 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -38,7 +38,7 @@ unset($_SERVER['argv'][1]);
 if (extension_loaded('xdebug')) {
 	// Quiet it a bit as this interfers with the nice testing output
 	ini_set('xdebug.show_exception_trace', FALSE);
-} // END - if
+}
 
 // Autoload more stuff
 require dirname(__DIR__) . '/vendor/autoload.php';