removed unnecessary echo statements