Cleaning up some of the reviver code