Happily ever after (the refactor, that is)