py3 pep8 fixes
Map is more like a local client