PEP8 and cleanup
client data import
fixed client data import,