fixed some phpmd/cs/scrutinizer warnings