Minor re-arranging.