WLS: Minor restructuring of sections / subsections.