#24 PHPCS Fixes & clone Cleaning