Comments and re-arranging