Small phpmd cleanups

Small phpmd cleanups