PEP8 Adjustments