added some clean up