PEP8 adjustments