A bit more tidy up and rearrangement in preparation