PEP8 fixes, various modules