Fixed/suppressed PHPMD warnings