clean up use of echo