PEP8 + reorganize imports

pep8 nitpicking :)