[ot] Minor shuffling code around
2 files changed