Remove yield code that broke a generator
Reorder file variables in convert function