UFC veteran Cynthia Calvillo is preparing to make a comeback in the strawweight division, as she gears up to face former LFA champion Lupita Godinez at the upcoming UFC 287 event on April 9.