tpcf cleaned up a bit