clean up and add tdominiform