Whitespace cleanups
Code cleanup in adcon
Pep-8 cleanups