Minor change, remove redundant echo's.