some cleaning and todo cleaning