Refactor and cleanup in ClientMDMap.
pep8 cleanups for client_map.py