Style: Misc flake 8 fixes