PEP8 Fixes