added some cleanups...