Python3 and PEP-8 fixes.