otec: minor refactoring