Updated to PEP 8 style guide & added names for Clients