added some cleanup