diff --git a/src/psm/Module/Install/Controller/InstallController.php b/src/psm/Module/Install/Controller/InstallController.php
index 170e2ca0..667a2696 100644
--- a/src/psm/Module/Install/Controller/InstallController.php
+++ b/src/psm/Module/Install/Controller/InstallController.php
@@ -76,7 +76,6 @@ class InstallController extends AbstractController {
 			$this->addMessage('PHP version: '.$phpv, 'success');
 		}
 		if (version_compare(PHP_RELEASE_VERSION, '7', '<')) {
-			// TODO PHP 5 has reached the end of life. Add warning for those who still use it.
 			$this->addMessage('PHP 5 reaches the end of life (January 1, 2019), please update to PHP 7. PHP supported versions can be found <a href="https://secure.php.net/supported-versions.php" target="_blank" rel="noopener">here</a>.', 'warning');
 		}
 		if (!function_exists('curl_init')) {
diff --git a/src/psm/Module/Server/Controller/StatusController.php b/src/psm/Module/Server/Controller/StatusController.php
index a83ebccf..2fcb410f 100644
--- a/src/psm/Module/Server/Controller/StatusController.php
+++ b/src/psm/Module/Server/Controller/StatusController.php
@@ -43,7 +43,6 @@ class StatusController extends AbstractServerController {
 
 	/**
 	 * Prepare the template to show a list of all servers
-	 * @todo move the background colurs to the config
 	 */
 	protected function executeIndex() {
 		// set background color to black
@@ -60,8 +59,8 @@ class StatusController extends AbstractServerController {
 			'label_online' => psm_get_lang('servers', 'online'),
 			'label_offline' => psm_get_lang('servers', 'offline'),
 			'label_rtime' => psm_get_lang('servers', 'latency'),
-			'block_layout_active'	=> ($layout == 0) ? 'active' : '',
-			'list_layout_active'	=> ($layout != 0) ? 'active' : '',
+			'block_layout_active' => ($layout == 0) ? 'active' : '',
+			'list_layout_active' => ($layout != 0) ? 'active' : '',
 			'label_add_server' => psm_get_lang('system', 'add_new'),
 			'url_save' => psm_build_url(array('mod' => 'server', 'action' => 'edit')),
 		);
diff --git a/src/psm/Util/Install/Installer.php b/src/psm/Util/Install/Installer.php
index ba8ae51c..6cda0b38 100644
--- a/src/psm/Util/Install/Installer.php
+++ b/src/psm/Util/Install/Installer.php
@@ -77,7 +77,6 @@ class Installer {
 		}
 
 		// different DB version, check if the version requires any changes
-		// @todo this is currently a manual check for each version, similar to upgrade().. not a clean way
 		if (version_compare($version_db, PSM_VERSION, '<')) {
 			return true;
 		} else {