[OTLayout] Refactor a bit more
6 files changed