Refactor OPT to OFT