remove else
Refactor inflector