ox: Small refactoring