Do some PEP8 cleanup