Further pep8 cleanup
Tweaks to client driver for pep8 compliance