More PHP code cleanup