STY: Import and pep 8 cleanup
Merge pull request #1365 from jseabold/ar-pep8

STY: Import and pep 8 cleanup