PEP 8 Fixes