diff --git a/app/Helpers/locale_helper.php b/app/Helpers/locale_helper.php
index de1f39882..c501c84f5 100644
--- a/app/Helpers/locale_helper.php
+++ b/app/Helpers/locale_helper.php
@@ -13,12 +13,12 @@ define('DEFAULT_DATETIME', mktime(0, 0, 0, 1, 1, 2010));
 /**
  * Currency locale helper
  */
-function current_language_code(bool $load_system_language = FALSE): string
+function current_language_code(bool $load_system_language = false): string
 {
 	$employee = model(Employee::class);
 
 	// Returns the language code of the employee if set or system language code if not
-	if($employee->is_logged_in() && $load_system_language != TRUE)	//TODO: !==
+	if($employee->is_logged_in() && $load_system_language === false)
 	{
 		$employee_info = $employee->get_logged_in_employee_info();
 
diff --git a/app/Libraries/Mailchimp_lib.php b/app/Libraries/Mailchimp_lib.php
index 0f4b60565..edf532324 100644
--- a/app/Libraries/Mailchimp_lib.php
+++ b/app/Libraries/Mailchimp_lib.php
@@ -39,15 +39,9 @@ class MailchimpConnector
 	{
 		$encrypter = Services::encrypter();
 
-		if(empty($api_key))
-		{
-			$stored_key = config('OSPOS')->settings['mailchimp_api_key'];
-			$this->_api_key = $encrypter->decrypt($stored_key);	//TODO: Hungarian notation
-		}
-		else
-		{
-			$this->_api_key = $api_key;	//TODO: Hungarian notation
-		}
+		$this->_api_key = empty($api_key)
+			? $encrypter->decrypt(config('OSPOS')->settings['mailchimp_api_key'])	//TODO: Hungarian notation
+			: $api_key;	//TODO: Hungarian notation
 
 		if(!empty($this->_api_key))	//TODO: Hungarian notation
 		{