Fixed my undo of the refacotr a bit