Added some cleaning