diff --git a/src/administrator/components/com_weblinks/src/Field/Modal/WeblinkField.php b/src/administrator/components/com_weblinks/src/Field/Modal/WeblinkField.php
index a9fc98a..07bf11b 100644
--- a/src/administrator/components/com_weblinks/src/Field/Modal/WeblinkField.php
+++ b/src/administrator/components/com_weblinks/src/Field/Modal/WeblinkField.php
@@ -211,6 +211,10 @@ class WeblinkField extends FormField
 			);
 		}
 
+		$closeButtonClick = "window.processModalEdit(this,  '$this->id', 'add', 'weblink', 'cancel', 'weblink-form'); return false;";
+		$saveButtonClick  = "window.processModalEdit(this,  '$this->id', 'add', 'weblink', 'save', 'weblink-form'); return false;";
+		$applyButtonClick = "window.processModalEdit(this,  '$this->id', 'add', 'weblink', 'apply', 'weblink-form'); return false;";
+
 		// New weblink modal
 		if ($allowNew)
 		{
@@ -228,13 +232,13 @@ class WeblinkField extends FormField
 					'bodyHeight'  => '70',
 					'modalWidth'  => '80',
 					'footer'      => '<a role="button" class="btn" aria-hidden="true"'
-						. ' onclick="window.processModalEdit(this, \'' . $this->id . '\', \'add\', \'weblink\', \'cancel\', \'weblink-form\'); return false;">'
+						. ' onclick="' . $closeButtonClick . '">'
 						. Text::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</a>'
 						. '<a role="button" class="btn btn-primary" aria-hidden="true"'
-						. ' onclick="window.processModalEdit(this, \'' . $this->id . '\', \'add\', \'weblink\', \'save\', \'weblink-form\'); return false;">'
+						. ' onclick="' . $saveButtonClick . '">'
 						. Text::_('JSAVE') . '</a>'
 						. '<a role="button" class="btn btn-success" aria-hidden="true"'
-						. ' onclick="window.processModalEdit(this, \'' . $this->id . '\', \'add\', \'weblink\', \'apply\', \'weblink-form\'); return false;">'
+						. ' onclick="' . $applyButtonClick . '">'
 						. Text::_('JAPPLY') . '</a>',
 				)
 			);
@@ -257,13 +261,13 @@ class WeblinkField extends FormField
 					'bodyHeight'  => '70',
 					'modalWidth'  => '80',
 					'footer'      => '<a role="button" class="btn" aria-hidden="true"'
-						. ' onclick="window.processModalEdit(this, \'' . $this->id . '\', \'edit\', \'weblink\', \'cancel\', \'weblink-form\'); return false;">'
+						. ' onclick="' . $closeButtonClick . '">'
 						. Text::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</a>'
 						. '<a role="button" class="btn btn-primary" aria-hidden="true"'
-						. ' onclick="window.processModalEdit(this, \'' . $this->id . '\', \'edit\', \'weblink\', \'save\', \'weblink-form\'); return false;">'
+						. ' onclick="' . $saveButtonClick . '">'
 						. Text::_('JSAVE') . '</a>'
 						. '<a role="button" class="btn btn-success" aria-hidden="true"'
-						. ' onclick="window.processModalEdit(this, \'' . $this->id . '\', \'edit\', \'weblink\', \'apply\', \'weblink-form\'); return false;">'
+						. ' onclick="' . $applyButtonClick . '">'
 						. Text::_('JAPPLY') . '</a>',
 				)
 			);
diff --git a/src/administrator/components/com_weblinks/src/Service/HTML/AdministratorService.php b/src/administrator/components/com_weblinks/src/Service/HTML/AdministratorService.php
index 0910d32..98c560e 100644
--- a/src/administrator/components/com_weblinks/src/Service/HTML/AdministratorService.php
+++ b/src/administrator/components/com_weblinks/src/Service/HTML/AdministratorService.php
@@ -81,6 +81,7 @@ class AdministratorService
 
 			if ($items)
 			{
+				$app       = Factory::getApplication();
 				$languages = LanguageHelper::getContentLanguages(array(0, 1));
 				$content_languages = array_column($languages, 'lang_code');
 
@@ -91,7 +92,8 @@ class AdministratorService
 						$text = $item->lang_code;
 						$url = Route::_('index.php?option=com_weblinks&task=weblink.edit&id=' . (int) $item->id);
 						$tooltip = '<strong>' . htmlspecialchars($item->language_title, ENT_QUOTES, 'UTF-8') . '</strong><br>'
-							. htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8') . '<br>' . Text::sprintf('JCATEGORY_SPRINTF', $item->category_title);
+							. htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8')
+							. '<br>' . Text::sprintf('JCATEGORY_SPRINTF', $item->category_title);
 						$classes = 'badge bg-secondary';
 
 						$item->link = '<a href="' . $url . '" class="' . $classes . '">' . $text . '</a>'
@@ -100,7 +102,7 @@ class AdministratorService
 					else
 					{
 						// Display warning if Content Language is trashed or deleted
-						Factory::getApplication()->enqueueMessage(Text::sprintf('JGLOBAL_ASSOCIATIONS_CONTENTLANGUAGE_WARNING', $item->lang_code), 'warning');
+						$app->enqueueMessage(Text::sprintf('JGLOBAL_ASSOCIATIONS_CONTENTLANGUAGE_WARNING', $item->lang_code), 'warning');
 					}
 				}
 			}
diff --git a/src/components/com_weblinks/src/Model/WeblinkModel.php b/src/components/com_weblinks/src/Model/WeblinkModel.php
index 25544ce..809ae33 100644
--- a/src/components/com_weblinks/src/Model/WeblinkModel.php
+++ b/src/components/com_weblinks/src/Model/WeblinkModel.php
@@ -193,7 +193,6 @@ class WeblinkModel extends ItemModel
 			}
 		}
 
-
 		return $this->_item[$pk];
 	}
 
diff --git a/src/components/com_weblinks/src/View/Weblink/HtmlView.php b/src/components/com_weblinks/src/View/Weblink/HtmlView.php
index 485df27..f524c1b 100644
--- a/src/components/com_weblinks/src/View/Weblink/HtmlView.php
+++ b/src/components/com_weblinks/src/View/Weblink/HtmlView.php
@@ -71,13 +71,13 @@ class HtmlView extends BaseHtmlView
 
 		$item->event = new \stdClass;
 
-		$results                        = $app->triggerEvent('onContentAfterTitle', array('com_weblinks.weblink', &$item, &$item->params, $offset));
+		$results = $app->triggerEvent('onContentAfterTitle', array('com_weblinks.weblink', &$item, &$item->params, $offset));
 		$item->event->afterDisplayTitle = trim(implode("\n", $results));
 
-		$results                           = $app->triggerEvent('onContentBeforeDisplay', array('com_weblinks.weblink', &$item, &$item->params, $offset));
+		$results = $app->triggerEvent('onContentBeforeDisplay', array('com_weblinks.weblink', &$item, &$item->params, $offset));
 		$item->event->beforeDisplayContent = trim(implode("\n", $results));
 
-		$results                          = $app->triggerEvent('onContentAfterDisplay', array('com_weblinks.weblink', &$item, &$item->params, $offset));
+		$results = $app->triggerEvent('onContentAfterDisplay', array('com_weblinks.weblink', &$item, &$item->params, $offset));
 		$item->event->afterDisplayContent = trim(implode("\n", $results));
 
 		parent::display($tpl);
diff --git a/src/components/com_weblinks/tmpl/category/default_items.php b/src/components/com_weblinks/tmpl/category/default_items.php
index 5b297fc..769bd2e 100644
--- a/src/components/com_weblinks/tmpl/category/default_items.php
+++ b/src/components/com_weblinks/tmpl/category/default_items.php
@@ -60,10 +60,10 @@ $listDirn  = $this->escape($this->state->get('list.direction'));
 			</div>
 		<?php endif; ?>
 		<?php if (empty($this->items)) : ?>
-            <div class="alert alert-info">
-                <span class="icon-info-circle" aria-hidden="true"></span><span class="visually-hidden"><?php echo Text::_('INFO'); ?></span>
-                <?php echo Text::_('COM_WEBLINKS_NO_WEBLINKS'); ?>
-            </div>
+			<div class="alert alert-info">
+				<span class="icon-info-circle" aria-hidden="true"></span><span class="visually-hidden"><?php echo Text::_('INFO'); ?></span>
+				<?php echo Text::_('COM_WEBLINKS_NO_WEBLINKS'); ?>
+			</div>
 		<?php else : ?>
 			<ul class="category list-unstyled">
 				<?php foreach ($this->items as $i => $item) : ?>
@@ -156,7 +156,7 @@ $listDirn  = $this->escape($this->state->get('list.direction'));
 								<div class="mt-2 mb-2">
 									<?php $images = json_decode($item->images); ?>
 									<?php if (!empty($images->image_first)) : ?>
-										<?php $imgFloat = '' ;?>
+										<?php $imgFloat = '';?>
 										<?php if (!empty($images->float_first)) : ?>
 											<?php $imgFloat = $images->float_first == 'right' ? 'float-end' : 'float-start'; ?>
 										<?php endif; ?>
diff --git a/src/components/com_weblinks/tmpl/weblink/default.php b/src/components/com_weblinks/tmpl/weblink/default.php
index 3f6c755..ca40dc6 100644
--- a/src/components/com_weblinks/tmpl/weblink/default.php
+++ b/src/components/com_weblinks/tmpl/weblink/default.php
@@ -64,7 +64,7 @@ if (!$canEdit)
 		<div class="p-3">
 			<?php $images = json_decode($this->item->images); ?>
 			<?php if (!empty($images->image_first)) : ?>
-				<?php $imgFloat = '' ;?>
+				<?php $imgFloat = '';?>
 				<?php if (!empty($images->float_first)) : ?>
 					<?php $imgFloat = $images->float_first == 'right' ? 'float-end' : 'float-start'; ?>
 				<?php endif; ?>