Various pep8 fixes and adv-read restructuring.
Move adcp to adp.