Done some cleaning in the scripts