added cleanup and summary