Tiny style changes to some imports
Merge pull request #811 from alex/import-style

Tiny style changes to some imports