Pep8 fixes, remove commented ipdb, group imports.
Merge remote-tracking branch 'refs/remotes/ivan/bug/cosmetic-fixes' into develop