Fixing the PHPCS and PHPMD errors/warnnings