Aggressive pep8 refactor of client