A bit of tidying up

… before a rearrange