Minor clean ups

Fixing some minor issues found with pylint.  I've done them in separate commits in case you don't want all ofg the fixes.  Feel free to squash if necessary.

Here you're fundamentally changing something that I think may be a personal style preference of @kennethreitz. I want him to weigh in before anything else.