Cleaning up php.php a bit