Update for PEP8