Fix PEP8 issues, other minor changes
Merge pull request #1 from chadlung/master

Fix PEP8 issues, other minor changes