Made some cleaning