CS violations fixes/PHPMD violations fixes