Cleaned up TFE a little bit