Simplify imports and format in compliance with PEP8
Merge pull request #77 from sjakobi/fix-imports

Simplify imports and format in compliance with PEP8