style and pep8!

also, fixed an error when list() would bork in an error condition.
Merge pull request #3 from berg/master

style and pep8!