fixed some more phpmd violations