At this point you can add Java to non-fad list, right? It's been around for 23 years and it's the most popular language used in industry. I'm currently supporting Java code that's old enough to vote.
Local refractors in code your touching anyways tend to work great though. Since your changing it you’ve built enough understanding to refactor it correctly.