Having a spring clean

A bit of tidying here, a bit of trimming there…