If you feel annoyed at your code, maybe that's a signal that I should take that frustration and fix rather than just endure this code. You probably also need some guide rails, maybe safety nets is a better analogy here. If you're going to start tearing stuff up, maybe you want to have tests to make sure that it still works or something like that.