FIXED : PHPCS Fixes
FIXED : Scrutinizer Fixes