Fix the PEP8 issues