PEP8 cleanup