Client.py cleanup