cleaning up echo code.