tidy up the echo statements