And with that you are prepared to answer the question Tidy First? Over & over. Each time slightly different but each time affected by the same forces:
Cost. Will tidying make costs smaller, later, or less likely?
Revenue. Will tidying make revenue larger, sooner, or more likely?
Coupling. Will tidying make it so I need to change fewer elements?
Cohesion. Will tidying make it so the elements I need to change are in a smaller, more concentrated scope?
Most important, though, is you. Will tidying bring peace, satisfaction, & joy to your programming? Because if you are your best self, you are a better programmer. You can't be your best self if you're always rushing, if you're always changing code that's painful to change.