More cleaning up Echomesh.py