change names of sections and some cleaning