Done some cleaning