PEP8 fixes (except multiple of 4)