Client file clean-up
PEP-8 / Eclipse Auto-Format