Refactor oc settings