Removed echo statements and comments