Tidy up and some rearrangement

No content changes