A bit of cleaning work