pep8 fixes

Another set of pep8 fixes
@dopplershift, perhaps we should have the boolean explicitly look for those two possible values?