Commented all echo statements