PEP8 fixes and small things