A bit of tidying up. Still more to come!