Small style cleanup for imports
Merge pull request #800 from alex/style-cleanup

Small style cleanup for imports