Remove unused model import
Wrap long line
Add missing space after commas
Merge pull request #101 from treyhunner/code-cleanup

Basic code style cleanup