Just some clean up