restructuring: phpmd working