Pep8 fixes, remove commented ipdb, group imports.