Cleaning up Echomesh.py