Refactor oonib runner