On a good note though, my rewritten compartmented code seems easier and more logical, to me at least.
That's good to hear! I guarantee that if you go back and look at it in 12 months you'll think "dear god, what was I thinking? This is awful!". But that's a good thing, because it means you're continuously improving how you code