More OC and some clean up