A bit of tidying up and a new class for CSD