tft class refactoring