[#1140] PEP8 Code cleanup

New PR meant to replace #1135 -- only PEP8 cleanups here, now..