cleanup & comments, more 'pythonic'
more cleanup, prep for next go...