some cleaning modifications