diff --git a/datamodels/2.x/itop-tickets/module.itop-tickets.php b/datamodels/2.x/itop-tickets/module.itop-tickets.php
index 679ac5e88..eab6932eb 100755
--- a/datamodels/2.x/itop-tickets/module.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/module.itop-tickets.php
@@ -73,7 +73,7 @@ class TicketsInstaller extends ModuleInstallerAPI
 		// Without test, new entries added to the data files, would be automatically loaded
 		if (($sPreviousVersion === '') ||
 			(version_compare($sPreviousVersion, $sCurrentVersion, '<')
-				and version_compare($sPreviousVersion, '3.0.1', '<'))) {
+				&& version_compare($sPreviousVersion, '3.0.1', '<'))) {
 			$oDataLoader = new XMLDataLoader();
 
 			CMDBObject::SetTrackInfo("Initialization");
diff --git a/setup/xmldataloader.class.inc.php b/setup/xmldataloader.class.inc.php
index 5f609a183..6197becd0 100644
--- a/setup/xmldataloader.class.inc.php
+++ b/setup/xmldataloader.class.inc.php
@@ -165,12 +165,9 @@ class XMLDataLoader
 	 */
 	protected function ClearKeysCache()
 	{
-		if(is_file($this->m_sCacheFileName))
-		{
+		if (is_file($this->m_sCacheFileName)) {
 			unlink($this->m_sCacheFileName);
-		}
-		else
-		{
+		} else {
 			//echo "<p>Hm, it looks like the file does not exist!!!</p>";
 		}
 		$this->m_aKeys = array();