Optimize imports
Merge pull request #303 from wmde/optimize

Optimize imports