python simplifications
Merge pull request #1 from sbrother/master

python simplifications