Refactor overcloud scripts