Commit before refactoring
Refactored FT to preserve DRY principle