Tidy up, small reorder