Match delta config more to main config
Some cleanup to code and comments