P2P.py Code Cleanup