refactor oracle aligning logic out of the oracle converter