Further clean up of Echomesh.py