Improved Inflect.php