[OTLayout] Minor refactoring
2 files changed