More clean up of Path.py