Incorporated comments from Cullen on re-grouping sections and few more nits