Declare missing dependencies.
Cleanup (pep8, imports)
Merge branch 'jone-cleanup'