Minor re-arranging