pep8'ified the pyro code, cleanup imports