Imports simplified.
Merge pull request #3 from TargetProcess/code-cleanup

Code cleanup