Merge pull request #1 from tclose/modular

pep8 fixes