phpmd fixes