A bit of cleaning and upgrade