Refactored Inflector.