pep8 fixes

Another set of pep8 fixes
I think these expressions are not equivalent `&` is bitwise and where as `and` is `bool(a) and bool(b)`.