I agree. My strategy is usually to rewrite parts over time, rather than to make everything new out of nothing. But if you can make it easier to maintain, that would be very nice.
Thank you for taking the time to do this anyway.