more cleanup and nicer seperation of concerns
error handling
pep8 h8
Merge remote-tracking branch 'upstream/master'