Cleaned up TFM_Util