Removed most of the silly text mangling in optimization