clean up some PHPMD warnings