clean up and add tango