True, we are the ones responsible for our integrity and we often live with our mistakes, paying for poor design choices during later maintenance cycles.<p>Just be aware that it can be easy to get lost in a yak-shaving exercise doing your cleanup refactoring. I recommend timeboxing this phase to no more than an hour, or prioritizing one or two specific tasks so that you don&#x27;t go off the deep end.<p>Don&#x27;t forget that others are depending on you to get their work done. There may be a 2-hour cleanup task somewhere else in the code that will help your teammates far more than the itch you want to scratch here and now.