Quite a bit of refactoring. Moving code to classes where it can be shared by the consolidator and the debaser.