fixed more phpmd violations