done with some cleaning