PEP008 and misc cleanup