Update refactor and driver code