Minor re-organise.