PEP8 fixes and stuff