Improvements and source cleaning