Cleaning up some code, remember when Cii was called Inflector?