reordered sections, improved markup