PEP8 Tweaks