Renamed and reformatted few sections.