PEP8 (except for width 80) fixes