some cleaning-up