edited, cleaned