diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index bdca5f74d0a..2d0dc6b4090 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -3699,14 +3699,18 @@ abstract class CommonObject
 	 */
 	static public function deleteAllItemsLinkedByObjectID($fk_object_where, $field_where, $table_element)
 	{
-		if (empty($fk_object_where) || empty($field_where) || empty($table_element)) return -1;
+		if (empty($fk_object_where) || empty($field_where) || empty($table_element)) {
+			return -1;
+		}
 
 		global $db;
 
 		$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$table_element.' WHERE '.$field_where.' = '.$fk_object_where;
 		$resql = $db->query($sql);
 
-		if (empty($resql)) return 0;
+		if (empty($resql)) {
+			return 0;
+		}
 
 		return 1;
 	}
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 1b29af772a7..d3147eafa6f 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -1509,9 +1509,15 @@ class FormMail extends Form
 			//,'__PERSONALIZED__' => 'Personalized'	// Hidden because not used yet in mass emailing
 
 			$onlinepaymentenabled = 0;
-			if (!empty($conf->paypal->enabled)) $onlinepaymentenabled++;
-			if (!empty($conf->paybox->enabled)) $onlinepaymentenabled++;
-			if (!empty($conf->stripe->enabled)) $onlinepaymentenabled++;
+			if (!empty($conf->paypal->enabled)) {
+				$onlinepaymentenabled++;
+			}
+			if (!empty($conf->paybox->enabled)) {
+				$onlinepaymentenabled++;
+			}
+			if (!empty($conf->stripe->enabled)) {
+				$onlinepaymentenabled++;
+			}
 			if ($onlinepaymentenabled && !empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
 				$tmparray['__SECUREKEYPAYMENT__'] = $conf->global->PAYMENT_SECURITY_TOKEN;
 				if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {