PEP 8
PYTHONPATH fixes