changed order of sections
formatting clean-up