1485 owl refactoring