Cleaning sources & improvements