done some cleaning